aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-01-24 18:21:53 -0800
committerBrett Profitt <brett.profitt@gmail.com>2012-01-24 18:22:43 -0800
commit38679b40b4234a4739e14ba418d1cd82110bd02c (patch)
treea87ad7f971ecb2b845c2e721bb9ec9e6f891104f
parent618263935a0b01bcef7a94153a41be1a6170154a (diff)
downloadelgg-38679b40b4234a4739e14ba418d1cd82110bd02c.tar.gz
elgg-38679b40b4234a4739e14ba418d1cd82110bd02c.tar.bz2
Fixes #4326. Disabling system log for upgrades.
-rw-r--r--upgrade.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/upgrade.php b/upgrade.php
index 3081f7a77..6f7126326 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -20,6 +20,9 @@ define('UPGRADING', 'upgrading');
require_once(dirname(__FILE__) . "/engine/start.php");
if (get_input('upgrade') == 'upgrade') {
+ // disable the core system log for upgrades to avoid exceptions when the schema changes.
+ elgg_unregister_event_handler('all', 'all', 'system_log_listener');
+
if (elgg_get_unprocessed_upgrades()) {
version_upgrade();
}
@@ -29,8 +32,8 @@ if (get_input('upgrade') == 'upgrade') {
} else {
// if upgrading from < 1.8.0, check for the core view 'welcome' and bail if it's found.
// see http://trac.elgg.org/ticket/3064
- // we're not checking the exact view location because it's likely themes will have this view.
- // we're only concerned with core.
+ // we're not checking the view itself because it's likely themes will override this view.
+ // we're only concerned with core files.
$welcome = dirname(__FILE__) . '/views/default/welcome.php';
if (file_exists($welcome)) {
elgg_set_viewtype('failsafe');