diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-05-20 03:31:44 +0400 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-05-20 03:31:44 +0400 |
| commit | bdb10637e458c5c5c33e30d94822c662e8b5a5e7 (patch) | |
| tree | e4ade95f2dcbee2044269ff140eff967220c884a /plugins/Installation | |
| parent | 7156d3407291aae6553dad63b60953b2e7e2727f (diff) | |
fixes #1360
Diffstat (limited to 'plugins/Installation')
| -rw-r--r-- | plugins/Installation/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/Installation/templates/systemCheck.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 96ec168119..f83233f7eb 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -801,7 +801,7 @@ class Piwik_Installation_Controller extends Piwik_Controller { $infos['integrityErrorMessages'][] = '<b>'.Piwik_Translate('General_FileIntegrityWarningExplanation').'</b>'; } - $infos['integrityErrorMessages'] += array_slice($integrityInfo, 1); + $infos['integrityErrorMessages'] = array_merge($infos['integrityErrorMessages'], array_slice($integrityInfo, 1)); } $infos['timezone'] = Piwik::isTimezoneSupportEnabled(); diff --git a/plugins/Installation/templates/systemCheck.tpl b/plugins/Installation/templates/systemCheck.tpl index 11b0ed78dc..b0433c96a3 100644 --- a/plugins/Installation/templates/systemCheck.tpl +++ b/plugins/Installation/templates/systemCheck.tpl @@ -146,7 +146,7 @@ {else} {$error} <i>{$infos.integrityErrorMessages[0]}</i> {/if} - {if count($infos.integrityErrorMessages) >= 1} + {if count($infos.integrityErrorMessages) > 1} <button id="more-results" class="ui-button ui-state-default ui-corner-all">{'General_Details'|translate}</button> {/if} {/if} |