Merge pull request #9234 from annando/issue-9231

[friendica.git] / src / Model / Tag.php

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index a48f2cb92b6dc71308576e274d78d1fb45667dc1..40f2f8d6a1600ffe0622ca81ec6d09fa0259c482 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -93,6 +93,10 @@ class Tag
                                return;
                        }
 
+                       if ((substr($url, 0, 7) == 'https//') || (substr($url, 0, 6) == 'http//')) {
+                               Logger::notice('Wrong scheme in url', ['url' => $url, 'callstack' => System::callstack(20)]);
+                       }
+
                        if (!$probing) {
                                $condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false];
                                $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
@@ -436,6 +440,21 @@ class Tag
                return $return;
        }
 
+       /**
+        * Counts posts for given tag
+        *
+        * @param string $search
+        * @param integer $uid
+        * @return integer number of posts
+        */
+       public static function countByTag(string $search, int $uid = 0)
+       {
+               $condition = ["`name` = ? AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
+               $params = ['group_by' => ['uri-id']];
+
+               return DBA::count('tag-search-view', $condition, $params);
+       }
+
        /**
         * Search posts for given tag
         *