Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / upgrade.php

diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index 06a2f74771bb8e2be374a38434e30a45f1f9b098..c6f3e28606a7fbd2c5ef03b229d6fb0f583beff1 100755 (executable)
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -29,7 +29,7 @@ Upgrade database schema and data to latest software
 
 END_OF_UPGRADE_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 function main()
 {
@@ -105,7 +105,9 @@ function fixupNoticeRendered()
 
     while ($notice->fetch()) {
         $original = clone($notice);
-        $notice->rendered = common_render_content($notice->content, $notice);
+        $notice->rendered = common_render_content($notice->content,
+                                                  $notice->getProfile(),
+                                                  $notice->hasParent() ? $notice->getParent() : null);
         $notice->update($original);
     }
 
@@ -333,7 +335,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) {
@@ -359,7 +361,7 @@ function initGroupMemberURI()
                 $mem->query(sprintf('update group_member set uri = "%s" '.
                                     'where profile_id = %d ' . 
                                     'and group_id = %d ',
-                                    Group_member::newURI($mem->profile_id, $mem->group_id, $mem->created),
+                                    Group_member::newUri(Profile::getByID($mem->profile_id), User_group::getByID($mem->group_id), $mem->created),
                                     $mem->profile_id,
                                     $mem->group_id));
             } catch (Exception $e) {