summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-11-20 20:54:16 -0800
committerBharat Mediratta <bharat@menalto.com>2010-11-20 20:54:16 -0800
commit12b77c7ef4bb715df45aa7299872691cc0c4dcef (patch)
treed942c43c2a284e326c5a56c2cae5f03f639d8f2c /modules/gallery
parent13cc0087ec135caf67e7c3c2becd9a12b72298b4 (diff)
Move the sys_getloadavg() call into the template since that's what we're doing for other similar calls
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/helpers/gallery_block.php1
-rw-r--r--modules/gallery/views/admin_block_platform.html.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 3e2a7313..86886237 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -70,7 +70,6 @@ class gallery_block_Core {
$block->css_id = "g-platform";
$block->title = t("Platform information");
$block->content = new View("admin_block_platform.html");
- $block->content->load_average = join(" ", sys_getloadavg());
break;
case "project_news":
diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index 379ab0aa..9a594fa5 100644
--- a/modules/gallery/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
@@ -16,7 +16,7 @@
<?= t("MySQL: %mysql_version", array("mysql_version" => Database::instance()->query("SELECT version() as v")->current()->v)) ?>
</li>
<li>
- <?= t("Server load: %load_average", array("load_average" => $load_average)) ?>
+ <?= t("Server load: %load_average", array("load_average" => join(" ", sys_getloadavg()))) ?>
</li>
<li>
<?= t("Graphics toolkit: %toolkit", array("toolkit" => module::get_var("gallery", "graphics_toolkit"))) ?>