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

issue 426 step 1 reverted:

Browse Source 
svn merge -r1466:1465 .
svn merge -r1463:1462 .


git-svn-id: http://piwigo.org/svn/trunk@1376 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-06-22 18:17:47 +00:00
parent 84536f0275
commit ad45eccd33
215 changed files with 29 additions and 5131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+1 -9
View File
@@ -201,17 +201,9 @@ if ($user['is_the_guest'])
list($user['template'], $user['theme']) = explode('/', $user['template']);
// TODO : replace initial $user['template'] by $user['layout']
if (defined('IN_ADMIN') && IN_ADMIN)
{
$template_root = 'admin';
}
else
{
$template_root = 'public';
}
include(
PHPWG_ROOT_PATH
.'template/'.$template_root.'/'.$user['template']
.'template/'.$user['template']
.'/theme/'.$user['theme']
.'/themeconf.inc.php'
);
include/functions.inc.php
+2 -2
View File
@@ -597,11 +597,11 @@ function url_is_remote($url)
/**
* returns available template/theme
*/
function get_pwg_themes($template_root = 'public')
function get_pwg_themes()
{
$themes = array();
$template_dir = PHPWG_ROOT_PATH.'template'.'/'.$template_root;
$template_dir = PHPWG_ROOT_PATH.'template';
foreach (get_dirs($template_dir) as $template)
{
include/page_header.php
+1 -10
View File
@@ -28,16 +28,7 @@
//
// Start output of page
//
if (defined('IN_ADMIN') && IN_ADMIN)
{
$template->set_rootdir(PHPWG_ROOT_PATH.'template/admin/'.$user['template']);
$template->set_filenames(array('header'=>'header.tpl'));
}
else
{
$template->set_rootdir(PHPWG_ROOT_PATH.'template/public/'.$user['template']);
$template->set_filenames(array('header'=>'header.tpl'));
}
$template->set_filenames(array('header'=>'header.tpl'));
$template->assign_vars(
array(