Standards

diff --git a/include/items.php b/include/items.php
index 7883038db1afeac4b1e479f86266501ed624319b..3c20bc41cfdce0fd7fd37fdb15c28065934b3465 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -322,13 +322,13 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
                $arr['protocol'] = PROTOCOL_DFRN;
 
                // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
-               // In difference to the call to "Item::GuidFromUri" several lines below we add the hash of our own host.
+               // In difference to the call to "Item::guidFromUri" several lines below we add the hash of our own host.
                // This is done because our host is the original creator of the post.
                if (!isset($arr['guid'])) {
                        if (isset($arr['plink'])) {
-                               $arr['guid'] = Item::GuidFromUri($arr['plink'], $a->get_hostname());
+                               $arr['guid'] = Item::guidFromUri($arr['plink'], $a->get_hostname());
                        } elseif (isset($arr['uri'])) {
-                               $arr['guid'] = Item::GuidFromUri($arr['uri'], $a->get_hostname());
+                               $arr['guid'] = Item::guidFromUri($arr['uri'], $a->get_hostname());
                        }
                }
        } else {
@@ -338,9 +338,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
        if ($notify) {
                $guid_prefix = "";
        } elseif ((trim($arr['guid']) == "") && (trim($arr['plink']) != "")) {
-               $arr['guid'] = Item::GuidFromUri($arr['plink']);
+               $arr['guid'] = Item::guidFromUri($arr['plink']);
        } elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) {
-               $arr['guid'] = Item::GuidFromUri($arr['uri']);
+               $arr['guid'] = Item::guidFromUri($arr['uri']);
        } else {
                $parsed = parse_url($arr["author-link"]);
                $guid_prefix = hash("crc32", $parsed["host"]);

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 50f92296a81b33509cd207e43f999e08df3ef191..40ecc20a986b56e1c6abef8609ce79e8c810e11c 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -338,7 +338,7 @@ class Item
         * @param string $host (Optional) hostname for the GUID prefix
         * @return string unique guid
         */
-       public static function GuidFromUri($uri, $host = "")
+       public static function guidFromUri($uri, $host = "")
        {
                // Our regular guid routine is using this kind of prefix as well
                // We have to avoid that different routines could accidentally create the same value

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 3081c2aa3c24cefbda3a4cbea06312dd0537247b..c129c31b013a26a6727c6db8f65ba6b14aa16b7c 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -427,7 +427,7 @@ class Feed {
                                // Distributed items should have a well formatted URI.
                                // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
                                if ($notify) {
-                                       $item['guid'] = Item::GuidFromUri($orig_plink, $a->get_hostname());
+                                       $item['guid'] = Item::guidFromUri($orig_plink, $a->get_hostname());
                                        unset($item['uri']);
                                        unset($item['parent-uri']);
                                }