diff options
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 14 | ||||
| -rw-r--r-- | view/pl/hmessages.po | 2 | ||||
| -rw-r--r-- | view/pl/hstrings.php | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index c56d73421..bab70997e 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1096,7 +1096,6 @@ class Activity { call_hooks('encode_person', $arr); $ret = $arr['encoded']; - return $ret; } diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 95510c349..eeeff9613 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -58,15 +58,13 @@ class Search extends Controller { $o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false)); - if (local_channel() && strpos($search, 'https://') === 0) { + if (local_channel() && strpos($search, 'https://') === 0 && !$update && !$load) { $j = Activity::fetch($search, App::get_channel()); if ($j) { $AS = new ActivityStreams($j); - if ($AS->is_valid()) { // check if is_an_actor, otherwise import activity if (is_array($AS->obj) && !ActivityStreams::is_an_actor($AS->obj)) { - // The boolean flag enables html cache of the item $item = Activity::decode_note($AS); if ($item) { logger('parsed_item: ' . print_r($item, true), LOGGER_DATA); @@ -76,6 +74,14 @@ class Search extends Controller { } } } + else { + // try other fetch providers (e.g. diaspora) + $hookdata = [ + 'channel' => App::get_channel(), + 'data' => $search + ]; + call_hooks('fetch_provider', $hookdata); + } } if (strpos($search, '#') === 0) { @@ -120,7 +126,7 @@ class Search extends Controller { // Here is the way permissions work in the search module... // Only public posts can be shown // OR your own posts if you are a logged in member - // No items will be shown if the member has a blocked profile wall. + // No items will be shown if the member has a blocked profile wall. if ((!$update) && (!$load)) { diff --git a/view/pl/hmessages.po b/view/pl/hmessages.po index bf8c56d73..5ef34eb5e 100644 --- a/view/pl/hmessages.po +++ b/view/pl/hmessages.po @@ -10,7 +10,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2));\n" "X-Generator: Poedit 2.3\n" #: ../../Zotlabs/Access/Permissions.php:56 diff --git a/view/pl/hstrings.php b/view/pl/hstrings.php index 943fe36f3..7a58ab97f 100644 --- a/view/pl/hstrings.php +++ b/view/pl/hstrings.php @@ -2,10 +2,10 @@ if(! function_exists("string_plural_select_pl")) { function string_plural_select_pl($n){ - return ($n==1 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12)); + return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} App::$rtl = 0; -App::$strings["plural_function_code"] = "(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12))"; +App::$strings["plural_function_code"] = "(n==1 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))"; App::$strings["Can view my channel stream and posts"] = "Może wyświetlać strumień i posty z mojego kanału"; App::$strings["Can send me their channel stream and posts"] = "Może przesyłać mi strumień swojego kanału i posty"; App::$strings["Can view my default channel profile"] = "Może wyświetlać mój domyślny profil kanału"; |