Refs #4487. Turning off system log (even more) during upgrades. Removed debug call...

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index f32dee0f08b98840589e82012bb3d1a61ecc8820..7383f5e043d100c244b610d9d0201b285241d41a 100644 (file)
--- 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 6f7126326f5e9329bb76589a88d6fc251ed96c9b..9635232005cca9812d45539042959330bb98ee6c 100644 (file)
--- 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()) {