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

[quix0rs-gnu-social.git] / plugins / OStatus / scripts / fixup-shadow.php

diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php
old mode 100644 (file)
new mode 100755 (executable)
index 18df299..ffaae55
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
@@ -47,13 +47,13 @@ $count = $user->N;
 echo "Found $count...\n";
 
 while ($user->fetch()) {
-    $uri = $user->uri;
+    $uri = $user->getUri();
     echo "user $user->id ($user->nickname) hidden by $uri";
     if ($dry) {
         echo " - skipping\n";
     } else {
         echo " - removing bogus ostatus_profile entry...";
-        $evil = Ostatus_profile::staticGet('uri', $uri);
+        $evil = Ostatus_profile::getKV('uri', $uri);
         $evil->delete();
         echo "  ok\n";
     }
@@ -71,13 +71,13 @@ $count = $group->N;
 echo "Found $count...\n";
 
 while ($group->fetch()) {
-    $uri = $group->uri;
+    $uri = $group->getUri();
     echo "group $group->id ($group->nickname) hidden by $uri";
     if ($dry) {
         echo " - skipping\n";
     } else {
         echo " - removing bogus ostatus_profile entry...";
-        $evil = Ostatus_profile::staticGet('uri', $uri);
+        $evil = Ostatus_profile::getKV('uri', $uri);
         $evil->delete();
         echo "  ok\n";
     }
@@ -106,10 +106,10 @@ $count = $group->N;
 echo "Found $count...\n";
 
 while ($group->fetch()) {
-    $uri = $group->uri;
+    $uri = $group->getUri();
     if (preg_match('!/group/(\d+)/id!', $uri, $matches)) {
         $id = intval($matches[1]);
-        $local = Local_group::staticGet('group_id', $id);
+        $local = Local_group::getKV('group_id', $id);
         if ($local) {
             $nick = $local->nickname;
         } else {
@@ -120,7 +120,7 @@ while ($group->fetch()) {
             echo " - skipping\n";
         } else {
             echo " - removing bogus user_group entry...";
-            $evil = User_group::staticGet('id', $group->id);
+            $evil = User_group::getKV('id', $group->id);
             $evil->delete();
             echo "  ok\n";
         }
@@ -152,10 +152,10 @@ $count = $oprofile->N;
 echo "Found $count...\n";
 
 while ($oprofile->fetch()) {
-    $uri = $oprofile->uri;
-    if (preg_match('!/group/(\d+)/id!', $oprofile->uri, $matches)) {
+    $uri = $oprofile->getUri();
+    if (preg_match('!/group/(\d+)/id!', $oprofile->getUri(), $matches)) {
         $id = intval($matches[1]);
-        $group = Local_group::staticGet('group_id', $id);
+        $group = Local_group::getKV('group_id', $id);
         if ($group) {
             $nick = $group->nickname;
         } else {
@@ -164,7 +164,7 @@ while ($oprofile->fetch()) {
         echo "group $id ($nick) hidden by $uri";
     } else if (preg_match('!/user/(\d+)!', $uri, $matches)) {
         $id = intval($matches[1]);
-        $user = User::staticGet('id', $id);
+        $user = User::getKV('id', $id);
         if ($user) {
             $nick = $user->nickname;
         } else {