aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-05-10 19:45:00 -0700
committerBrett Profitt <brett.profitt@gmail.com>2012-05-10 19:45:00 -0700
commit25b1a1ea11182b6fc195f4cca76ec4788d79c65e (patch)
tree49415bbe641d8e83a78927b47d8756fb2c4fdc3a
parentf5e638639fe8d443b88fc1a1b786c6b8fbee8fb3 (diff)
downloadelgg-25b1a1ea11182b6fc195f4cca76ec4788d79c65e.tar.gz
elgg-25b1a1ea11182b6fc195f4cca76ec4788d79c65e.tar.bz2
Refs #4487. Turning off system log (even more) during upgrades. Removed debug call to system_log() in create_annotation().
-rw-r--r--engine/lib/annotations.php2
-rw-r--r--upgrade.php3
2 files changed, 2 insertions, 3 deletions
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()) {