mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 08:06:38 +02:00
Code Issues Releases Wiki Activity

Fixes #540 - BC path fix for core templates in theme directory.

Browse Source
This commit is contained in:
Cameron
2014-03-14 17:25:40 -07:00
parent 677ddd1431
commit 4d3c000831
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_handlers/e107_class.php
View File

@@ -1918,18 +1918,26 @@ class e107
*/ */
public static function coreTemplatePath($id, $override = true) public static function coreTemplatePath($id, $override = true)
{ {
$id = str_replace('..', '', $id); //simple security, '/' is allowed $id = str_replace('..', '', $id); //simple security, '/' is allowed
$override_path = $override ? self::getThemeInfo($override, 'rel').'templates/'.$id.'_template.php' : null; $curTheme = self::getThemeInfo($override, 'rel');
$legacy_path = e_THEME.'templates/'.$id.'_template.php';
$core_path = e_CORE.'templates/'.$id.'_template.php';
if($override_path && is_readable($override_path)) $override_path = $override ? $curTheme.'templates/'.$id.'_template.php' : null;
$legacy_override_path = $override ? $curTheme.$id.'_template.php' : null;
$legacy_core_path = e_THEME.'templates/'.$id.'_template.php';
$core_path = e_CORE.'templates/'.$id.'_template.php';
if($override_path && is_readable($override_path)) // v2 override template.
{ {
return $override_path; return $override_path;
} }
elseif(is_readable($legacy_path)) elseif($legacy_override_path && is_readable($legacy_override_path)) //v1 override template.
{ {
return $legacy_path; return $legacy_override_path;
}
elseif(is_readable($legacy_core_path)) //v1 core template.
{
return $legacy_core_path;
} }
return $core_path; return $core_path;