summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-10 09:14:48 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-10 09:14:48 -0700
commit5469e46ef5bd464559a648fdc02b285313132155 (patch)
tree19e3a40c10a008a62443ff696d8b67b33af01e80
parentc0853e304051a3b8ceacb95d6977ca62df5e25a6 (diff)
merge error in util.php
-rw-r--r--lib/util.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 9872d97c4..b3a94a5a0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -922,7 +922,6 @@ function common_enqueue_notice_transport($notice, $transport)
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
throw new ServerException('DB error inserting queue item: ' . $last_error->message);
->>>>>>> 0.7.x:lib/util.php
}
common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
return true;