Changeset 2700 for trunk/include

Timestamp:

Oct 10, 2008, 3:11:31 PM (16 years ago)

Author:

rvelices

Message:

• 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)

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• functions.inc.php (modified) (3 diffs)

trunk/include/common.inc.php

@@ -138 +138 @@
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
-include(PHPWG_ROOT_PATH . 'include/template.class.php');
 
 // Database connection

trunk/include/functions.inc.php

@@ -31 +31 @@
 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
@@ -70 +71 @@
 {
   $boolean = true;
-  if ( preg_match( '/^false$/i', $string ) )
+  if ( 'false' == strtolower($string) )
   {
     $boolean = false;
@@ -87 +88 @@
   if (is_bool($var))
   {
-    if ($var)
-    {
-      return 'true';
-    }
-    else
-    {
-      return 'false';
-    }
+    return $var ? 'true' : 'false';
   }
   else