merge -c2823 from branch 2.0 to trunk

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

git-svn-id: http://piwigo.org/svn/trunk@2824 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 14 deletions

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 074a8aae9..7681e49cd 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -211,12 +211,6 @@ function build_user( $user_id, $use_cache )
   // 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']);
 
   return $user;
@@ -1373,14 +1367,7 @@ function get_sql_condition_FandF(
   }
   else
   {
-    if ($force_one_condition)
-    {
-      $sql = '1 = 1';
-    }
-    else
-    {
-      $sql = '';
-    }
+    $sql = $force_one_condition ? '1 = 1' : '';
   }
 
   if (isset($prefix_condition) and !empty($sql))