GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Managed_DataObject::newUri was called improperly

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-11-23 00:39:49 +01:00
parent 1630424797
commit b01484a0a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Favorite/FavoritePlugin.php
View File

@ -96,7 +96,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin
' modified = "%s" '. ' modified = "%s" '.
'WHERE user_id = %d '. 'WHERE user_id = %d '.
'AND notice_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)), common_sql_date(strtotime($fave->modified)),
$fave->user_id, $fave->user_id,
$fave->notice_id)); $fave->notice_id));

2
scripts/upgrade.php
View File

@ -333,7 +333,7 @@ function initSubscriptionURI()
'set uri = "%s" '. 'set uri = "%s" '.
'where subscriber = %d '. 'where subscriber = %d '.
'and subscribed = %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->subscriber,
$sub->subscribed)); $sub->subscribed));
} catch (Exception $e) { } catch (Exception $e) {