mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02:00
Code Issues Releases Wiki Activity

New Constant: THEME_LEGACY added. Old themes will have a value of true, new themes (using theme.xml) as false.

Browse Source
This commit is contained in:
Cameron
2017-01-15 08:56:13 -08:00
parent 5522ee3559
commit de1ec15976
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
class2.php
View File

@@ -823,6 +823,7 @@ if (!function_exists('checkvalidtheme'))
{ {
// arg1 = theme to check // arg1 = theme to check
//global $ADMIN_DIRECTORY, $tp, $e107; //global $ADMIN_DIRECTORY, $tp, $e107;
global $sql;
$e107 = e107::getInstance(); $e107 = e107::getInstance();
$tp = e107::getParser(); $tp = e107::getParser();
$ADMIN_DIRECTORY = $e107->getFolder('admin'); $ADMIN_DIRECTORY = $e107->getFolder('admin');
@@ -846,15 +847,27 @@ if (!function_exists('checkvalidtheme'))
define('PREVIEWTHEMENAME', $themeArray[$id]); define('PREVIEWTHEMENAME', $themeArray[$id]);
define('THEME', e_THEME.$themeArray[$id].'/'); define('THEME', e_THEME.$themeArray[$id].'/');
define('THEME_ABS', e_THEME_ABS.$themeArray[$id].'/'); define('THEME_ABS', e_THEME_ABS.$themeArray[$id].'/');
$legacy = (file_exists( e_THEME_ABS.$themeArray[$id].'/theme.xml') === false);
define('THEME_LEGACY',$legacy);
return; return;
} }
$sql->db_Mark_time("Theme Check");
if (@fopen(e_THEME.$theme_check.'/theme.php', 'r')) if (@fopen(e_THEME.$theme_check.'/theme.php', 'r'))
// if (is_readable(e_THEME.$theme_check.'/theme.php'))
{ {
define('THEME', e_THEME.$theme_check.'/'); define('THEME', e_THEME.$theme_check.'/');
define('THEME_ABS', e_THEME_ABS.$theme_check.'/'); define('THEME_ABS', e_THEME_ABS.$theme_check.'/');
$legacy = (file_exists(e_THEME.$theme_check.'/theme.xml') === false);
define('THEME_LEGACY',$legacy);
$e107->site_theme = $theme_check; $e107->site_theme = $theme_check;
} }
else else
@@ -889,6 +902,8 @@ if (!function_exists('checkvalidtheme'))
} }
} }
$sql->db_Mark_time("Theme Check End");
$themes_dir = $e107->getFolder('themes'); $themes_dir = $e107->getFolder('themes');
$e107->http_theme_dir = "{$e107->server_path}{$themes_dir}{$e107->site_theme}/"; $e107->http_theme_dir = "{$e107->server_path}{$themes_dir}{$e107->site_theme}/";
} }

2
e107_handlers/db_debug_class.php
View File

@@ -605,7 +605,7 @@ class e107_db_debug {
$inc = array( $inc = array(
'BOOTSTRAP','HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET', 'BOOTSTRAP','HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET',
'GUESTS_ONLINE','MEMBERS_ONLINE','PAGE_NAME','STANDARDS_MODE','TIMEOFFSET', 'GUESTS_ONLINE','MEMBERS_ONLINE','PAGE_NAME','STANDARDS_MODE','TIMEOFFSET',
'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER' 'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT', 'THEME_LEGACY','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER'
); );
$userCon = get_defined_constants(true); $userCon = get_defined_constants(true);