From 0e5f5a74b31c0df471304ccfdb57cba7a26b9925 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 10 Oct 2008 13:11:31 +0000 Subject: - replace a preg_match with simple comparison (faster) - try to get rid of some JS strict warnings in FF (hope it's fixed) - template.class.php is included from functions.inc.php instead of common,upgrade,install (maybe later I will try to see the perf impact of compacting/compiling functions.inc.php together with the included files from itself) git-svn-id: http://piwigo.org/svn/trunk@2700 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions.inc.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'include/functions.inc.php') diff --git a/include/functions.inc.php b/include/functions.inc.php index f2c5511dd..a75df8c4f 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -30,6 +30,7 @@ include_once( PHPWG_ROOT_PATH .'include/functions_html.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' ); +include_once( PHPWG_ROOT_PATH .'include/template.class.php'); //----------------------------------------------------------- generic functions @@ -69,7 +70,7 @@ function get_enums($table, $field) function get_boolean( $string ) { $boolean = true; - if ( preg_match( '/^false$/i', $string ) ) + if ( 'false' == strtolower($string) ) { $boolean = false; } @@ -86,14 +87,7 @@ function boolean_to_string($var) { if (is_bool($var)) { - if ($var) - { - return 'true'; - } - else - { - return 'false'; - } + return $var ? 'true' : 'false'; } else { -- cgit v1.2.3