CRM-12634 Simplified fix using crmURL.

----------------------------------------
* CRM-12634: Return to home page link on upgrade finish page doesn't need to rebuild menus
  http://issues.civicrm.org/jira/browse/CRM-12634

diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php
index 444862849654cc8c9fbb3b30cc673688704515cb..3390c41f972fdc65ee585c5601703e882ce200f4 100644 (file)
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -54,9 +54,6 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     $template->assign('pageTitle', ts('Upgrade CiviCRM to Version %1',
       array(1 => $latestVer)
     ));
-    $template->assign('menuRebuildURL',
-      CRM_Utils_System::url('civicrm/menu/rebuild', 'reset=1')
-    );
     $template->assign('cancelURL',
       CRM_Utils_System::url('civicrm/dashboard', 'reset=1')
     );

diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index 20cfcb0f13912ef20550d7067de138533ee2e4b7..8cdf59a41d4cc58f756a2e8f8f2841b7fe732313 100644 (file)
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -67,6 +67,6 @@
         <h3>Important Notes</h3>
         <p>{$afterUpgradeMessage}</p>
       {/if}
-      <p><a href="{$menuRebuildURL}" title="{ts}CiviCRM home page{/ts}" style="text-decoration: underline;">{ts}Return to CiviCRM home page.{/ts}</a></p>
+      <p><a href="{crmURL p='civicrm/dashboard' q='reset=1'}" title="{ts}CiviCRM home page{/ts}" style="text-decoration: underline;">{ts}Return to CiviCRM home page.{/ts}</a></p>
     </div>
 {/if}