wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge error in util.php

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-10 09:14:48 -07:00
parent c0853e3040
commit 5469e46ef5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/util.php
View File

@ -922,7 +922,6 @@ function common_enqueue_notice_transport($notice, $transport)
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message); common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
throw new ServerException('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); common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
return true; return true;