Changeset 2824 for trunk/include/functions_user.inc.php

Timestamp:

Nov 4, 2008, 2:47:48 AM (15 years ago)

Author:

rvelices

Message:

merge -c2823 from branch 2.0 to trunk

• removed some unused constants from constants.php
• removed some unused css rules
• removed unused code

File:

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

trunk/include/functions_user.inc.php

@@ -211 +211 @@
   // calculation of the number of picture to display per page
   $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
-
-  if (is_admin($user['status']))
-  {
-    list($user['admin_template'], $user['admin_theme']) =
-      explode ('/', $conf['admin_layout']);
-  }
 
   list($user['template'], $user['theme']) = explode('/', $user['template']);
@@ -1374 +1368 @@
   else
   {
-    if ($force_one_condition)
-    {
-      $sql = '1 = 1';
-    }
-    else
-    {
-      $sql = '';
-    }
+    $sql = $force_one_condition ? '1 = 1' : '';
   }