From: Brett Profitt <brett.profitt@gmail.com>
Date: Fri, 11 May 2012 02:45:00 +0000 (-0700)
Subject: Refs #4487. Turning off system log (even more) during upgrades. Removed debug call... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=25b1a1ea11182b6fc195f4cca76ec4788d79c65e;p=lorea%2Felgg.git

Refs #4487. Turning off system log (even more) during upgrades. Removed debug call to system_log() in create_annotation().
---

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index f32dee0f0..7383f5e04 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -95,8 +95,6 @@ $owner_guid = 0, $access_id = ACCESS_PRIVATE) {
 	$entity = get_entity($entity_guid);
 
 	if (elgg_trigger_event('annotate', $entity->type, $entity)) {
-		system_log($entity, 'annotate');
-
 		// If ok then add it
 		$result = insert_data("INSERT into {$CONFIG->dbprefix}annotations
 			(entity_guid, name_id, value_id, value_type, owner_guid, time_created, access_id) VALUES
diff --git a/upgrade.php b/upgrade.php
index 6f7126326..963523200 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -20,7 +20,8 @@ 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.
+	// disable the system log for upgrades to avoid exceptions when the schema changes.
+	elgg_unregister_event_handler('log', 'systemlog', 'system_log_default_logger');
 	elgg_unregister_event_handler('all', 'all', 'system_log_listener');
 	
 	if (elgg_get_unprocessed_upgrades()) {