From b01484a0a378a97c34d2cd76fe1601873236f817 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 23 Nov 2015 00:39:49 +0100 Subject: [PATCH] Managed_DataObject::newUri was called improperly --- plugins/Favorite/FavoritePlugin.php | 2 +- scripts/upgrade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Favorite/FavoritePlugin.php b/plugins/Favorite/FavoritePlugin.php index 438ea803ae..b10a5f06ac 100644 --- a/plugins/Favorite/FavoritePlugin.php +++ b/plugins/Favorite/FavoritePlugin.php @@ -96,7 +96,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin ' modified = "%s" '. 'WHERE user_id = %d '. 'AND notice_id = %d', - Fave::newUri($fave->user_id, $fave->notice_id, $fave->modified), + Fave::newUri($fave->getActor(), $fave->getTarget(), $fave->modified), common_sql_date(strtotime($fave->modified)), $fave->user_id, $fave->notice_id)); diff --git a/scripts/upgrade.php b/scripts/upgrade.php index 06a2f74771..cfdd260591 100755 --- a/scripts/upgrade.php +++ b/scripts/upgrade.php @@ -333,7 +333,7 @@ function initSubscriptionURI() 'set uri = "%s" '. 'where subscriber = %d '. 'and subscribed = %d', - Subscription::newURI($sub->subscriber, $sub->subscribed, $sub->created), + $sub->escape(Subscription::newUri($sub->getSubscriber(), $sub->getSubscribed(), $sub->created)), $sub->subscriber, $sub->subscribed)); } catch (Exception $e) {