Changeset 3127 for branches/2.0/include/functions_user.inc.php

Timestamp:

02/05/09 04:04:27 (4 years ago)

Author:

rvelices

Message:

merge r 3126 from trunk
- embellish_url compacts now ..
- some trigger improvements (render_category_description)
- improved perf of duplicate_xxx_url ( rewrote func params_for_duplication and remove some vars from $page )

Files:

• branches/2.0/include/functions_user.inc.php (modified) (2 diffs)

branches/2.0/include/functions_user.inc.php

@@ -761 +761 @@
 function get_default_user_info($convert_str = true)
 {
-  global $page, $conf;
-
-  if (!isset($page['cache_default_user']))
-  {
-    $query = 'select * from '.USER_INFOS_TABLE.
-            ' where user_id = '.$conf['default_user_id'].';';
+  global $cache, $conf;
+
+  if (!isset($cache['default_user']))
+  {
+    $query = 'SELECT * FROM '.USER_INFOS_TABLE.
+            ' WHERE user_id = '.$conf['default_user_id'].';';
 
     $result = pwg_query($query);
-    $page['cache_default_user'] = mysql_fetch_assoc($result);
-
-    if ($page['cache_default_user'] !== false)
-    {
-      unset($page['cache_default_user']['user_id']);
-      unset($page['cache_default_user']['status']);
-      unset($page['cache_default_user']['registration_date']);
-    }
-  }
-
-  if (is_array($page['cache_default_user']) and $convert_str)
+    $cache['default_user'] = mysql_fetch_assoc($result);
+
+    if ($cache['default_user'] !== false)
+    {
+      unset($cache['default_user']['user_id']);
+      unset($cache['default_user']['status']);
+      unset($cache['default_user']['registration_date']);
+    }
+  }
+
+  if (is_array($cache['default_user']) and $convert_str)
   {
     $default_user = array();
-    foreach ($page['cache_default_user'] as $name => $value)
+    foreach ($cache['default_user'] as $name => $value)
     {
       // If the field is true or false, the variable is transformed into a
@@ -799 +799 @@
   else
   {
-    return $page['cache_default_user'];
+    return $cache['default_user'];
   }
 }