CRM-17323 - Fix site registration links

diff --git a/CRM/Admin/Page/Admin.php b/CRM/Admin/Page/Admin.php
index 10abe03f881e90c0c4e2b64f6decb7a5a006ded4..3b29c3f559275b243494929424bae6fcf13d37ff 100644 (file)
--- a/CRM/Admin/Page/Admin.php
+++ b/CRM/Admin/Page/Admin.php
@@ -57,6 +57,8 @@ class CRM_Admin_Page_Admin extends CRM_Core_Page {
       CRM_Core_Session::setStatus($errorMessage, ts('Warning'), "alert", array('expires' => 0));
     }
 
+    $this->assign('registerSite', htmlspecialchars('https://civicrm.org/register-your-site?src=iam&sid=' . CRM_Utils_System::getSiteID()));
+
     $groups = array(
       'Customize Data and Screens' => ts('Customize Data and Screens'),
       'Communications' => ts('Communications'),

diff --git a/CRM/Admin/Page/ConfigTaskList.php b/CRM/Admin/Page/ConfigTaskList.php
index 6491152c6d6df22ca9fbd50238d120d04827c11f..e1a85796dceabb554f9dbdde32cc2b14e2eeaa55 100644 (file)
--- a/CRM/Admin/Page/ConfigTaskList.php
+++ b/CRM/Admin/Page/ConfigTaskList.php
@@ -53,6 +53,8 @@ class CRM_Admin_Page_ConfigTaskList extends CRM_Core_Page {
     $destination = urlencode($destination);
     $this->assign('destination', $destination);
 
+    $this->assign('registerSite', htmlspecialchars('https://civicrm.org/register-your-site?src=iam&sid=' . CRM_Utils_System::getSiteID()));
+
     return parent::run();
   }
 

diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl
index 4f5272c5f9d5e1358f9c0bd0aae907ee23e377c6..8954e5ff224483052ebb53c881417ce5c26d9355 100644 (file)
--- a/templates/CRM/Admin/Page/Admin.tpl
+++ b/templates/CRM/Admin/Page/Admin.tpl
@@ -28,7 +28,7 @@
     <div class="messages status no-popup">
       <table>
         <tr><td class="tasklist">
-          {ts 1='https://civicrm.org/register-site'}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
+          {ts 1='{$registerSite}'}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
         </tr>
       </table>
     </div>

diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl
index b5eb0116d6f666280b170b6a86ea341fa54e4943..7a00d4e1a3379b02a2a486812ed40098aa0e8f1d 100644 (file)
--- a/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -47,7 +47,7 @@
         <td>{ts}Enable the required CiviCRM components.(CiviContribute, CiviEvent etc.){/ts}</td>
     </tr>
     <tr class="even">
-        <td class="tasklist nowrap"><a href="https://civicrm.org/register-site" title="{ts}Register your site at CiviCRM.org. Opens in a new window.{/ts}" target="_blank">{ts}Register your site{/ts}</a></td>
+        <td class="tasklist nowrap"><a href="{$registerSite}" title="{ts}Register your site at CiviCRM.org. Opens in a new window.{/ts}" target="_blank">{ts}Register your site{/ts}</a></td>
         <td>{ts}Register your site, join the community, and help CiviCRM remain a leading CRM for organizations worldwide.{/ts}</td>
     </tr>