From b03009d96217c8f3dbd024e5038123b6430875e1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 20 Nov 2016 16:14:09 +0100 Subject: [PATCH] use an array for warnings in admin panel --- mod/admin.php | 4 ++-- view/templates/admin_summary.tpl | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index c5ad7de3b6..67b8ed29f7 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -431,10 +431,10 @@ function admin_page_summary(&$a) { // are there MyISAM tables in the DB? If so, trigger a warning message $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine`='myisam' LIMIT 1"); $showwarning = false; - $warningtext = ""; + $warningtext = array(); if (dbm::is_result($r)) { $showwarning = true; - $warningtext = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); + $warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); } $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`"); $accounts = array( diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index 34df0db510..c8e8af2294 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -3,7 +3,9 @@

{{$title}} - {{$page}}

{{if $showwarning}}
-

{{$warningtext}}

+ {{foreach $warningtext as $wt}} +

{{$wt}}

+ {{/foreach}}
{{/if}}