Fixes #3064. Can't use the pretty new views to display the can't upgrade messages...

git-svn-id: http://code.elgg.org/elgg/trunk@8778 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/upgrade.php b/upgrade.php
index c235c3f3ef7caed15c14c51a13d0d44388acd0ff..b463a44a734fa25bb9248dd3083ea200a85b6613 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -30,16 +30,12 @@ if (get_input('upgrade') == 'upgrade') {
        // we're only concerned with core.
        $welcome = dirname(__FILE__) . '/views/default/welcome.php';
        if (file_exists($welcome)) {
-               $content = elgg_view_module('info', elgg_echo('upgrade:unable_to_upgrade'), 
-                               elgg_echo('upgrade:unable_to_upgrade_info'));
+               elgg_set_viewtype('failsafe');
+               // can't have pretty messages because we don't know the state of the views.
+               $content = elgg_echo('upgrade:unable_to_upgrade_info');
+               $title = elgg_echo('upgrade:unable_to_upgrade');
                
-               $params = array(
-                       'content' => $content,
-                       'title' => elgg_echo('upgrade:abort'),
-               );
-
-               $body = elgg_view_layout('one_column', $params);
-               echo elgg_view_page(elgg_echo('upgrade'), $body);
+               echo elgg_view_page($title, $content);
                exit;
        }