adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

svn merge -r1366:1371 from branch 1.6 into trunk

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-06-22 19:21:56 +00:00
parent ad45eccd33
commit a08cd1a583
9 changed files with 453 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+9 -1
View File
@@ -198,7 +198,15 @@ if ($user['is_the_guest'])
}
// include template/theme configuration
list($user['template'], $user['theme']) = explode('/', $user['template']);
if (defined('IN_ADMIN') and IN_ADMIN)
{
list($user['template'], $user['theme']) = explode('/', $conf['admin_layout']);
// TODO : replace $conf['admin_layout'] by $user['admin_layout']
}
else
{
list($user['template'], $user['theme']) = explode('/', $user['template']);
}
// TODO : replace initial $user['template'] by $user['layout']
include(