fixing merge commit with origin
This commit is contained in:
commit
09efdfc172
@ -13,7 +13,6 @@ if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
|
||||
// Propagate content our template
|
||||
$smarty->assign("BLOCKSFOUND", $aBlocksFoundData);
|
||||
$smarty->assign("BLOCKLIMIT", $iLimit);
|
||||
|
||||
} else {
|
||||
$debug->append('Using cached page', 3);
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@ if (!defined('SECURITY'))
|
||||
// Globally available variables
|
||||
$debug->append('Global smarty variables', 3);
|
||||
|
||||
$debug->append('No cached page detected, loading smarty globals', 3);
|
||||
// Defaults to get rid of PHP Notice warnings
|
||||
$dDifficulty = 1;
|
||||
$aRoundShares = 1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user