Merge pull request #3495 from JohnFF/patch-5

[civicrm-core.git] / CRM / Admin / Form / Setting / UpdateConfigBackend.php

diff --git a/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index 65204d20e70541f2509939043329f4cab06aa944..f543c1796282b7b5b5f566c975744a23f970654d 100644 (file)
--- a/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -45,7 +45,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
@@ -63,7 +63,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
 
     $this->addElement(
       'submit', $this->getButtonName('next', 'cleanup'), 'Cleanup Caches',
-      array('class' => 'form-submit', 'id' => 'cleanup-cache')
+      array('class' => 'crm-form-submit', 'id' => 'cleanup-cache')
     );
 
     $this->add('text', 'newBaseURL', ts('New Base URL'), NULL, TRUE);
@@ -91,6 +91,11 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
     return $this->_defaults;
   }
 
+  /**
+   * @param $fields
+   *
+   * @return array
+   */
   static function formRule($fields) {
     $tmpDir = trim($fields['newBaseDir']);
 
@@ -104,7 +109,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
   }
 
   function postProcess() {
-    if (CRM_Utils_Array::value('_qf_UpdateConfigBackend_next_cleanup', $_POST)) {
+    if (!empty($_POST['_qf_UpdateConfigBackend_next_cleanup'])) {
 
       $config = CRM_Core_Config::singleton();
 
@@ -115,6 +120,8 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
       CRM_Core_Config::clearDBCache();
       parent::rebuildMenu();
 
+      CRM_Core_BAO_WordReplacement::rebuild();
+
       CRM_Core_Session::setStatus(ts('Cache has been cleared and menu has been rebuilt successfully.'), ts("Success"), "success");
       return CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/admin/setting/updateConfigBackend', 'reset=1'));
     }