Merge pull request #3939 from annando/fix-sql

Fix some SQL problems
This commit is contained in:
Tobias Diekershoff
2017-11-24 09:53:36 +01:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -426,7 +426,7 @@ function uri_to_guid($uri, $host = "") {
* @return array Item array with removed conversation data
*/
function store_conversation($arr) {
if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)) && !empty($arr['uri'])) {
$conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date());
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {