aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-20 02:57:25 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-20 02:57:25 +0000
commitbd7b8852e986dc2cb8a59c9735d811ce6bd27afc (patch)
tree30007181cf74e4d6a5810934050cbc0ce5dc20a9
parent03a3d81977fe492a46d92fccdbbc67656506fef2 (diff)
downloadelgg-bd7b8852e986dc2cb8a59c9735d811ce6bd27afc.tar.gz
elgg-bd7b8852e986dc2cb8a59c9735d811ce6bd27afc.tar.bz2
Fixes #3064. Can't use the pretty new views to display the can't upgrade messages. Using the failsafe view type.
git-svn-id: http://code.elgg.org/elgg/trunk@8778 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--upgrade.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/upgrade.php b/upgrade.php
index c235c3f3e..b463a44a7 100644
--- 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;
}