Fixes #6588 - also removed the string from otrance translation platform.

matomo-org · Nov 4, 2014 · 0f65834 · 0f65834
1 parent 52bc764
commit 0f65834
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
@@ -36,7 +36,6 @@
  */
 class Controller extends \Piwik\Plugin\Controller
 {
-    const CONFIG_FILE_BACKUP = '/config/global.ini.auto-backup-before-update.php';
     const PATH_TO_EXTRACT_LATEST_VERSION = '/tmp/latest/';
 
     private $coreError = false;
@@ -97,7 +96,6 @@ public function oneClickUpdate()
             array('oneClick_Download', Piwik::translate('CoreUpdater_DownloadingUpdateFromX', $url)),
             array('oneClick_Unpack', Piwik::translate('CoreUpdater_UnpackingTheUpdate')),
             array('oneClick_Verify', Piwik::translate('CoreUpdater_VerifyingUnpackedFiles')),
-            array('oneClick_CreateConfigFileBackup', Piwik::translate('CoreUpdater_CreatingBackupOfConfigurationFile', self::CONFIG_FILE_BACKUP))
         );
         $incompatiblePlugins = $this->getIncompatiblePlugins($this->newVersion);
         if (!empty($incompatiblePlugins)) {
@@ -216,13 +214,6 @@ private function oneClick_Verify()
         }
     }
 
-    private function oneClick_CreateConfigFileBackup()
-    {
-        $configFileBefore = PIWIK_USER_PATH . '/config/global.ini.php';
-        $configFileAfter = PIWIK_USER_PATH . self::CONFIG_FILE_BACKUP;
-        Filesystem::copy($configFileBefore, $configFileAfter);
-    }
-
     private function oneClick_DisableIncompatiblePlugins()
     {
         $plugins = $this->getIncompatiblePlugins($this->newVersion);

diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json
@@ -1,7 +1,6 @@
 {
     "CoreUpdater": {
         "ClickHereToViewSqlQueries": "Click here to view and copy the list of SQL queries that will get executed",
-        "CreatingBackupOfConfigurationFile": "Creating a backup of the configuration file in %s",
         "CriticalErrorDuringTheUpgradeProcess": "Critical Error during the update process:",
         "DatabaseUpgradeRequired": "Database Upgrade Required",
         "DisablingIncompatiblePlugins": "Disabling incompatible plugins: %s",