Rename functions

rename functions from review comments

diff --git a/mod/photos.php b/mod/photos.php
index e1116c346b53f3fc3aa1663d6519cd4b9ad536e6..4c86d91010c03e4a5b3b3783f7c8c10c1e4c785b 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -297,7 +297,7 @@ function photos_post(App $a)
                                                intval($page_owner_uid)
                                        );
                                        Term::insertFromTagFieldByItemUri($rr['parent-uri'], $page_owner_uid);
-                                       Item::deleteThreadFromUri($rr['parent-uri'], $page_owner_uid);
+                                       Item::deleteThreadByUri($rr['parent-uri'], $page_owner_uid);
 
                                        $drop_id = intval($rr['id']);
 
@@ -371,7 +371,7 @@ function photos_post(App $a)
                                        intval($page_owner_uid)
                                );
                                Term::insertFromTagFieldByItemUri($i[0]['uri'], $page_owner_uid);
-                               Item::deleteThreadFromUri($i[0]['uri'], $page_owner_uid);
+                               Item::deleteThreadByUri($i[0]['uri'], $page_owner_uid);
 
                                $url = System::baseUrl();
                                $drop_id = intval($i[0]['id']);

diff --git a/mod/videos.php b/mod/videos.php
index 0f029f0472f0bf9249dc71f92e1458751aa6b0ab..26a4e4cce508c987f286e03ffa1b96154e3985c6 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -178,7 +178,7 @@ function videos_post(App $a) {
                                        intval(local_user())
                                );
                                Term::insertFromTagFieldByItemUri($i[0]['uri'], local_user());
-                               Item::deleteThreadFromUri($i[0]['uri'], local_user());
+                               Item::deleteThreadByUri($i[0]['uri'], local_user());
 
                                $url = System::baseUrl();
                                $drop_id = intval($i[0]['id']);

diff --git a/src/Model/Item.php b/src/Model/Item.php
index f971f0788edd35a6c5398c88de4b3a2946544967..8c8ae48af99350342eb00da908de789211842038 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1894,7 +1894,7 @@ EOT;
                }
        }
 
-       public static function updateThreadFromUri($itemuri, $uid)
+       public static function updateThreadByUri($itemuri, $uid)
        {
                $messages = dba::select('item', ['id'], ['uri' => $itemuri, 'uid' => $uid]);
        
@@ -1951,7 +1951,7 @@ EOT;
                logger("Updating public shadow for post ".$items["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG);
        }
        
-       public static function deleteThreadFromUri($itemuri, $uid)
+       public static function deleteThreadByUri($itemuri, $uid)
        {
                $messages = dba::select('item', ['id'], ['uri' => $itemuri, 'uid' => $uid]);
        

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 423f87aa9087bbb5461db2d98024bc6cb532dc29..2b3b9b0dc6a6bb5915c9d52e8f097f5536d39109 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2091,7 +2091,7 @@ class DFRN
                        dba::update('item', $fields, $condition);
 
                        Term::insertFromTagFieldByItemUri($item["uri"], $importer["importer_uid"]);
-                       Item::updateThreadFromUri($item["uri"], $importer["importer_uid"]);
+                       Item::updateThreadByUri($item["uri"], $importer["importer_uid"]);
 
                        $changed = true;
 
@@ -2840,7 +2840,7 @@ class DFRN
                                );
                                Term::insertFromTagFieldByItemUri($uri, $importer["uid"]);
                                Term::insertFromFileFieldByItemUri($uri, $importer["uid"]);
-                               Item::updateThreadFromUri($uri, $importer["uid"]);
+                               Item::updateThreadByUri($uri, $importer["uid"]);
                        } else {
                                $r = q(
                                        "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
@@ -2853,7 +2853,7 @@ class DFRN
                                );
                                Term::insertFromTagFieldByItemUri($uri, $importer["uid"]);
                                Term::insertFromFileFieldByItemUri($uri, $importer["uid"]);
-                               Item::updateThreadFromUri($uri, $importer["importer_uid"]);
+                               Item::updateThreadByUri($uri, $importer["importer_uid"]);
 
                                // if this is a relayed delete, propagate it to other recipients