RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge commit with origin

Browse Source
This commit is contained in:
Sebastian Grewe 2013-07-11 09:05:41 +02:00
commit 09efdfc172
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/include/pages/statistics/blocks.inc.php
View File

@ -13,7 +13,6 @@ if (!$smarty->isCached('master.tpl', md5(serialize($_REQUEST)))) {
// Propagate content our template // Propagate content our template
$smarty->assign("BLOCKSFOUND", $aBlocksFoundData); $smarty->assign("BLOCKSFOUND", $aBlocksFoundData);
$smarty->assign("BLOCKLIMIT", $iLimit); $smarty->assign("BLOCKLIMIT", $iLimit);
} else { } else {
$debug->append('Using cached page', 3); $debug->append('Using cached page', 3);
} }

1
public/include/smarty_globals.inc.php
View File

@ -7,6 +7,7 @@ if (!defined('SECURITY'))
// Globally available variables // Globally available variables
$debug->append('Global smarty variables', 3); $debug->append('Global smarty variables', 3);
$debug->append('No cached page detected, loading smarty globals', 3);
// Defaults to get rid of PHP Notice warnings // Defaults to get rid of PHP Notice warnings
$dDifficulty = 1; $dDifficulty = 1;
$aRoundShares = 1; $aRoundShares = 1;