// Welcome 2012²

This commit is contained in:
rMalie
2012-02-23 16:33:10 +00:00
parent 03d11f2d14
commit 14e6929565
1327 changed files with 2312 additions and 2353 deletions
+3 -8
View File
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision: 10840 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
@@ -304,9 +304,6 @@ abstract class Controller extends ControllerCore
$globalSize[$key] = round($size / 1024, 1);
}
arsort($globalSize);
$cache = Cache::retrieveAll();
$totalCacheSize = $this->sizeofvar($cache);
echo '<br /><br />
<div class="rte" style="text-align:left;padding:8px;float:left">
@@ -329,7 +326,7 @@ abstract class Controller extends ControllerCore
echo '</ul>
</div>
<div class="rte" style="text-align:left;padding:8px;float:left;margin-left:20px">
<b>Memory peak usage</b>: '.$this->displayMemoryColor(memory_get_peak_usage());
<b>Memory peak usage</b>: '.$this->displayMemoryColor(memory_get_peak_usage()).'';
if (self::$_footer)
{
echo '<ul>';
@@ -341,9 +338,7 @@ abstract class Controller extends ControllerCore
}
echo '</ul>';
}
echo '<br /><br />
<b>Total cache size (in Cache class)</b>: '.$this->displayMemoryColor($totalCacheSize).'
</div>';
echo '</div>';
echo '
<div class="rte" style="text-align:left;padding:8px;float:left;margin-left:20px">