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, 3 insertions, 9 deletions

diff --git a/include/common.inc.php b/include/common.inc.php
index 0b1a2b581..d31aefbb6 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -143,21 +143,15 @@ if (is_a_guest())
 }
 
 // template instance
-if
-  (
-      defined('IN_ADMIN') and IN_ADMIN
-  )
-{
-  // Admin template
-  //$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] );
+if ( defined('IN_ADMIN') and IN_ADMIN )
+{// Admin template
   list($user['admin_template'], $user['admin_theme']) =
     explode ('/', $conf['admin_layout']);
   $template = new Template(PHPWG_ROOT_PATH.'admin/template/'
     . $user['admin_template'], $user['admin_theme'] );
 }
 else
-{
-  // Classic template
+{ // Classic template
   $template = new Template(PHPWG_ROOT_PATH.'template/'
     . $user['template'], $user['theme'] );
 }