Merge remote-tracking branch 'upstream/master'

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

diff --git a/scripts/updateurls.php b/scripts/updateurls.php
index 01b3c2283bdbe371ca37b6d4d5aa049d1af60578..c49187c299407c194b27cb669f75ac3d395b3206 100644 (file)
--- a/scripts/updateurls.php
+++ b/scripts/updateurls.php
@@ -29,7 +29,7 @@ update stored URLs in the system
 
 END_OF_UPDATEURLS_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 function main()
 {
@@ -52,13 +52,8 @@ function updateUserUrls()
 
                 updateProfileUrl($profile);
                 updateAvatarUrls($profile);
-
-                // Broadcast for remote users
-
-                common_broadcast_profile($profile);
-
             } catch (Exception $e) {
-                printv("Error updating URLs: " . $e->getMessage());
+                echo "Error updating URLs: " . $e->getMessage();
             }
             printfv("DONE.");
         }
@@ -112,7 +107,7 @@ function updateGroupUrls()
         while ($group->fetch()) {
             try {
                 printfv("Updating group {$group->nickname}...");
-                $orig = User_group::staticGet('id', $group->id);
+                $orig = User_group::getKV('id', $group->id);
                 if (!empty($group->original_logo)) {
                     $group->original_logo = Avatar::url(basename($group->original_logo));
                     $group->homepage_logo = Avatar::url(basename($group->homepage_logo));
@@ -129,7 +124,7 @@ function updateGroupUrls()
                 $group->update($orig);
                 printfv("DONE.");
             } catch (Exception $e) {
-                printv("Can't update avatars for group " . $group->nickname . ": ". $e->getMessage());
+                echo "Can't update avatars for group " . $group->nickname . ": ". $e->getMessage();
             }
         }
     }