From ac2b0d296529697a37c5617c3a2550aebb4273f0 Mon Sep 17 00:00:00 2001
From: William Mortada <william@mortada.co.uk>
Date: Mon, 16 Oct 2017 12:25:02 +0100
Subject: [PATCH] Fix the error message link

It isn't necessary to build the link as docURL2() does this.  Also we don't need to check for the existence of the ts() function.
---
 install/index.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/install/index.php b/install/index.php
index b32c4f530d..19f20d29c8 100644
--- a/install/index.php
+++ b/install/index.php
@@ -223,7 +223,7 @@ if ($alreadyInstalled) {
   }
 
   $docLink = CRM_Utils_System::docURL2('Installation and Upgrades', FALSE, ts('Installation Guide'), NULL, NULL, "wiki");
-  $errorMsg = ts("CiviCRM has already been installed. <ul><li>To <strong>start over</strong>, you must delete or rename the existing CiviCRM settings file - <strong>civicrm.settings.php</strong> - from <strong>%1</strong>.</li><li>To <strong>upgrade an existing installation</strong>, <a href='%2'>refer to the online documentation</a>.</li></ul>", array(1 => $settings_directory, 2 => $docLink));
+  $errorMsg = ts("CiviCRM has already been installed. <ul><li>To <strong>start over</strong>, you must delete or rename the existing CiviCRM settings file - <strong>civicrm.settings.php</strong> - from <strong>%1</strong>.</li><li>To <strong>upgrade an existing installation</strong>, refer to the online documentation: %2.</li></ul>", array(1 => $settings_directory, 2 => $docLink));
   errorDisplayPage($errorTitle, $errorMsg, FALSE);
 }
 
@@ -1842,13 +1842,7 @@ function getSiteDir($cmsPath, $str) {
 function errorDisplayPage($errorTitle, $errorMsg, $showRefer = TRUE) {
   if ($showRefer) {
     $docLink = CRM_Utils_System::docURL2('Installation and Upgrades', FALSE, 'Installation Guide', NULL, NULL, "wiki");
-
-    if (function_exists('ts')) {
-      $errorMsg .= '<p>' . ts("<a %1>Refer to the online documentation for more information</a>", array(1 => "href='$docLink'")) . '</p>';
-    }
-    else {
-      $errorMsg .= '<p>' . sprintf("<a %s>Refer to the online documentation for more information</a>", "href='$docLink'") . '</p>';
-    }
+    $errorMsg .= '<p>' . ts("Refer to the online documentation for more information: ") . $docLink . '</p>';
   }
 
   include 'error.html';
-- 
2.25.1