diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-04 01:59:16 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-04 01:59:16 +0400 |
| commit | c9f5a4ec6c6ba6916e94a909c6a96d4e4da15ea0 (patch) | |
| tree | 0b467ee9aa8966f7c10fc0d05b834ff7faed5317 /plugins/CoreUpdater | |
| parent | 3102d976e06fd6ad28b8aba623e256ce11e3ae26 (diff) | |
Adjusted paths in AssetManager for plugins/Zeitgeist (for now static)
Implemented two functions and one filter in core/Twig (for now)
Lots of smarty->twig conversion
New master template for admin screen.
Diffstat (limited to 'plugins/CoreUpdater')
| -rw-r--r-- | plugins/CoreUpdater/Controller.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index bbd4644b3c..82100c2a66 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -37,7 +37,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller $newVersion = $this->checkNewVersionIsAvailableOrDie(); - $view = Piwik_View::factory('update_new_version_available'); + $view = new Piwik_View('update_new_version_available'); $view->piwik_version = Piwik_Version::VERSION; $view->piwik_new_version = $newVersion; $view->piwik_latest_version_url = self::getLatestZipUrl($newVersion); @@ -89,7 +89,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller Piwik_API_Request::reloadAuthUsingTokenAuth($_POST); Piwik::checkUserIsSuperUser(); - $view = Piwik_View::factory('update_one_click_results'); + $view = new Piwik_View('update_one_click_results'); $view->coreError = Piwik_Common::getRequestVar('error', '', 'string', $_POST); $view->feedbackMessages = safe_unserialize(Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('messages', '', 'string', $_POST))); echo $view->render(); @@ -237,18 +237,18 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller $sqlQueries = $updater->getSqlQueriesToExecute(); if (Piwik_Common::isPhpCliMode()) { if (Piwik_Common::isPhpCliMode()) { - $view = Piwik_View::factory('cli_update_welcome'); + $view = new Piwik_View('cli_update_welcome', array(), false); } else { - $view = Piwik_View::factory('update_welcome'); + $view = new Piwik_View('update_welcome'); } $this->doWelcomeUpdates($view, $componentsWithUpdateFile); echo $view->render(); if (!$this->coreError && Piwik::getModule() == 'CoreUpdater') { if (Piwik_Common::isPhpCliMode()) { - $view = Piwik_View::factory('cli_update_database_done'); + $view = new Piwik_View('cli_update_database_done', array(), false); } else { - $view = Piwik_View::factory('update_database_done'); + $view = new Piwik_View('update_database_done'); } $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile); echo $view->render(); @@ -256,9 +256,9 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller } else if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) { $this->warningMessages = array(); if (Piwik_Common::isPhpCliMode()) { - $view = Piwik_View::factory('cli_update_database_done'); + $view = new Piwik_View('cli_update_database_done', array(), false); } else { - $view = Piwik_View::factory('update_database_done'); + $view = new Piwik_View('update_database_done'); } $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile); @@ -269,9 +269,9 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller echo $view->render(); } else { if (Piwik_Common::isPhpCliMode()) { - $view = Piwik_View::factory('cli_update_welcome'); + $view = new Piwik_View('cli_update_welcome', array(), false); } else { - $view = Piwik_View::factory('update_welcome'); + $view = new Piwik_View('update_welcome'); } $view->queries = $sqlQueries; $view->isMajor = $updater->hasMajorDbUpdate(); |