1
0
mirror of https://github.com/e107inc/e107.git synced 2025-06-06 19:06:39 +02:00

Installation fix.

This commit is contained in:
Cameron 2017-02-03 07:39:20 -08:00
parent 71ce71bdb1
commit dacdb7841d
3 changed files with 23 additions and 8 deletions

View File

@ -1393,15 +1393,21 @@ class e107
*/
public static function getTheme($themedir='front', $clearCache=false)
{
if($themedir === 'front')
if(!defined('E107_INSTALL'))
{
$themedir= self::getPref('sitetheme');
if($themedir === 'front')
{
$themedir= self::getPref('sitetheme');
}
if($themedir === 'admin')
{
$themedir = self::getPref('admintheme');
}
}
if($themedir === 'admin')
{
$themedir = self::getPref('admintheme');
}
return self::getSingleton('e_theme', true, null, array('themedir'=> $themedir, 'force'=> $clearCache));
}

View File

@ -448,7 +448,16 @@ class e_theme
{
if(strstr($line, "CUSTOMPAGES"))
{
eval(str_replace("$", "\$", $line)); // detect arrays also.
try
{
@eval(str_replace("$", "\$", $line)); // detect arrays also.
}
catch (ParseError $e)
{
}
}
}

View File

@ -2121,7 +2121,7 @@ function template_data()
<div class="masthead">
<ul class="nav nav-pills pull-right" >
<li class="active" style="width:200px;text-align:center" ><a href="#" >'.LANINS_134.' &#58 {stage_pre} {stage_num} '.LANINS_135.' 8</a>
<li style="width:200px;text-align:center" ><a href="#" >'.LANINS_134.' &#58 {stage_pre} {stage_num} '.LANINS_135.' 8</a>
<div class="progress progress-{bartype}">
<div class="progress-bar bar" style="width: {percent}%"></div>
</div>