From c194b2ad8b99621c5bd7bf32f68d3c3d2399073c Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 12 Mar 2011 23:27:18 +0000 Subject: Fixes #3064. Checking for views/default/welcome.php and aborting upgrade if found. Need to add documention for how to replace views directory to wiki. Also fixed ajax loader during upgrade. git-svn-id: http://code.elgg.org/elgg/trunk@8678 36083f99-b078-4883-b0ff-0f9b5a30f544 --- languages/en.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'languages') diff --git a/languages/en.php b/languages/en.php index c597743e9..c65aaefd3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -955,6 +955,17 @@ Once you have logged in, we highly recommend that you change your password. 'upgrading' => 'Upgrading...', 'upgrade:db' => 'Your database was upgraded.', 'upgrade:core' => 'Your elgg installation was upgraded.', + 'upgrade:unable_to_upgrade' => 'Unable to upgrade.', + 'upgrade:unable_to_upgrade_info' => + 'This installation cannot be upgraded because legacy views + were detected in the Elgg core views directory. These views have been deprecated and need to be + removed for Elgg to function correctly. If you have not made changes to Elgg core, you can + simply delete the views directory and replace it with the one from the latest + package of Elgg downloaded from elgg.org.

+ + If you need detailed instructions, please visit the + Upgrading Elgg documentation. If you require assistance, please post to the + Community Support Forums.', 'deprecated:function' => '%s() was deprecated by %s()', -- cgit v1.2.3