- Timestamp:
- Jun 21, 2007, 10:49:45 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/site_update.php
r1903 r2038 5 5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | 6 6 // +-----------------------------------------------------------------------+ 7 // | branch : BSF (Best So Far) 8 // | file : $RCSfile$ 7 // | file : $Id$ 9 8 // | last update : $Date$ 10 9 // | last modifier : $Author$ … … 128 127 // +-----------------------------------------------------------------------+ 129 128 if (isset($_POST['submit']) 130 and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files') 131 and !$general_failure) 129 and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files')) 132 130 { 133 131 $counts['new_categories'] = 0; … … 136 134 $counts['new_elements'] = 0; 137 135 $counts['upd_elements'] = 0; 138 136 } 137 138 139 if (isset($_POST['submit']) 140 and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files') 141 and !$general_failure) 142 { 139 143 $start = get_moment(); 140 144 // which categories to update ? -
trunk/include/common.inc.php
r2030 r2038 171 171 172 172 // template instance 173 $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] ); 173 if 174 ( 175 defined('IN_ADMIN') and IN_ADMIN and 176 isset($user['admin_template']) and 177 isset($user['admin_theme']) 178 ) 179 { 180 // Admin template 181 $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] ); 182 } 183 else 184 { 185 // Classic template 186 $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] ); 187 } 174 188 175 189 if ($conf['gallery_locked']) -
trunk/include/functions_user.inc.php
r2032 r2038 146 146 { 147 147 global $conf; 148 148 149 $user['id'] = $user_id; 149 150 $user = array_merge( $user, getuserdata($user_id, $use_cache) ); … … 152 153 $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page']; 153 154 154 // include template/theme configuration 155 if (defined('IN_ADMIN') and IN_ADMIN) 156 { 157 list($user['template'], $user['theme']) = 155 list($user['template'], $user['theme']) = explode('/', $user['template']); 156 157 if (is_admin($user['status'])) 158 { 159 list($user['admin_template'], $user['admin_theme']) = 158 160 explode 159 161 ( … … 162 164 : $user['template'] 163 165 ); 164 // TODO : replace $conf['admin_layout'] by $user['admin_layout']165 }166 else167 {168 list($user['template'], $user['theme']) = explode('/', $user['template']);169 166 } 170 167
Note: See TracChangeset
for help on using the changeset viewer.