Merge pull request #197 from ronaldrager/master

Fixed html error in Installation, System Check page. Thanks for the pull request!
matomo-org · Jan 14, 2014 · 1742f92 · 1742f92 · sgiehl · Jan 15, 2014
2 parents 2984ed1 + f3d1cb4
commit 1742f92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -1084,7 +1084,7 @@
         "SystemCheckExtensions": "Other required extensions",
         "SystemCheckDatabaseHelp": "Piwik requires either the mysqli extension or both the PDO and pdo_mysql extensions.",
         "SystemCheckPdoAndMysqliHelp": "On a Linux server you can compile php with the following options: %1$s In your php.ini, add the following lines: %2$s",
-        "SystemCheckPhpPdoAndMysqliSite": "More information on: <a style=\"color:red\" href=\"http:\/\/php.net\/pdo\">PHP PDO<\/a> and <a style=\"color:red\" href=\"http:\/\/php.net\/mysqli\">MYSQLI<\/a>.",
+        "SystemCheckPhpPdoAndMysqli": "More information on: %1$sPHP PDO%2$s and %3$sMYSQLI%4$s.",
         "SystemCheckWinPdoAndMysqliHelp": "On a Windows server you can add the following lines to your php.ini: %s",
         "SystemCheckSplHelp": "You need to configure and rebuild PHP with the Standard PHP Library (SPL) enabled (by default).",
         "SystemCheckZlibHelp": "You need to configure and rebuild PHP with \"zlib\" support enabled, --with-zlib.",

diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
@@ -45,7 +45,7 @@
                     {{ 'Installation_RestartWebServer'|translate }}
                     <br/>
                     <br/>
-                    {{ 'Installation_SystemCheckPhpPdoAndMysqliSite'|translate }}
+                    {{ 'Installation_SystemCheckPhpPdoAndMysqli'|translate("<a style=\"color:red\" href=\"http:\/\/php.net\/pdo\">","<\/a>","<a style=\"color:red\" href=\"http:\/\/php.net\/mysqli\">","<\/a>")|raw|nl2br }}
                 </p>
             </td>
         </tr>