Changeset 2040

Timestamp:

Jun 21, 2007, 11:00:09 PM (17 years ago)

Author:

rub

Message:

Resolved issue 0000708: Error on synchronization

Resolved issue 0000709: Error with $confdefault_admin_layout

Merge BSF 2037:2039 into branch-1_7

Location:

branches/branch-1_7

Files:

• admin/site_update.php (modified) (3 diffs)
• include/common.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (3 diffs)

branches/branch-1_7/admin/site_update.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -128 +127 @@
 // +-----------------------------------------------------------------------+
 if (isset($_POST['submit'])
-    and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files')
-    and !$general_failure)
+    and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files'))
 {
   $counts['new_categories'] = 0;
@@ -136 +134 @@
   $counts['new_elements'] = 0;
   $counts['upd_elements'] = 0;
-
+}
+
+
+if (isset($_POST['submit'])
+    and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files')
+    and !$general_failure)
+{
   $start = get_moment();
   // which categories to update ?

branches/branch-1_7/include/common.inc.php

@@ -172 +172 @@
 
 // template instance
-$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
+if 
+  (
+      defined('IN_ADMIN') and IN_ADMIN and 
+      isset($user['admin_template']) and
+      isset($user['admin_theme'])
+  )
+{
+  // Admin template
+  $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] );
+}
+else
+{
+  // Classic template
+  $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
+}
 
 if ($conf['gallery_locked'])

branches/branch-1_7/include/functions_user.inc.php

@@ -145 +145 @@
 {
   global $conf;
+
   $user['id'] = $user_id;
   $user = array_merge( $user, getuserdata($user_id, $use_cache) );
@@ -153 +154 @@
   $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
 
-  // include template/theme configuration
-  if (defined('IN_ADMIN') and IN_ADMIN)
-  {
-    list($user['template'], $user['theme']) =
+  if (is_admin($user['status']))
+  {
+    list($user['admin_template'], $user['admin_theme']) =
       explode
       (
@@ -163 +163 @@
                                              : $user['template']
       );
-    // TODO : replace $conf['admin_layout'] by $user['admin_layout']
-  }
-  else
-  {
-    list($user['template'], $user['theme']) = explode('/', $user['template']);
-  }
+  }
+
+  list($user['template'], $user['theme']) = explode('/', $user['template']);
 
   return $user;