From 1a25dc3661cb185318502b188410d95a574dbbb7 Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Fri, 16 Sep 2016 14:01:27 +0200
Subject: [PATCH] Remove concat: required-flag
For #455
---
modules/core/templates/frontpage_config.tpl.php | 4 ++--
modules/core/www/frontpage_config.php | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index 8b7eed1c3..3e04ce392 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -87,8 +87,8 @@ if ($this->data['isadmin']) {
foreach ($this->data['funcmatrix'] AS $func) {
- echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>
- <td>' . $this->t('{core:frontpage:' . $func['required']. '}') . '</td><td>' . $func['descr'] . '</td></tr>';
+ echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>';
+ echo '<td>' . $this->t($t->data['requiredmap'][$func['required']]) . '</td><td>' . $func['descr'] . '</td></tr>';
}
echo('</table></div>');
}
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 5bff9f267..cd22c05d7 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -177,6 +177,7 @@ $t->data['links_federation'] = $links_federation;
$t->data['enablematrix'] = $enablematrix;
$t->data['funcmatrix'] = $funcmatrix;
+$t->data['requiredmap'] = array('recommended' => $t->noop('{core:frontpage:recommended}');
$t->data['version'] = $config->getVersion();
$t->data['directory'] = dirname(dirname(dirname(dirname(__FILE__))));
--
GitLab