diff options
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Toggle_mobile.php | 23 | ||||
| -rw-r--r-- | Zotlabs/Module/Toggle_safesearch.php | 31 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 9 |
5 files changed, 11 insertions, 59 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 75d2ffbe9..b819ef0f7 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1727,9 +1727,12 @@ class Activity { foreach ($links as $link) { if (is_array($link) && array_key_exists('mediaType', $link) && $link['mediaType'] === 'text/html') { $profile = $link['href']; + } elseif (is_string($link)) { + $profile = $link; + break; } } - if (!$profile) { + if (!$profile && isset($links[0]['href'])) { $profile = $links[0]['href']; } } diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 9f028bb46..55a1de5dd 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -148,7 +148,7 @@ class ActivityStreams { // Determine if this is a followup or response activity - $this->parent_id = $this->get_property_obj('inReplyTo'); + $this->parent_id = ((is_array($this->get_property_obj('inReplyTo'))) ? $this->get_property_obj('inReplyTo')['id'] : $this->get_property_obj('inReplyTo')); if (!$this->parent_id && isset($this->obj['inReplyTo'])) { $this->parent_id = ((is_array($this->obj['inReplyTo'])) ? $this->obj['inReplyTo']['id'] : $this->obj['inReplyTo']); diff --git a/Zotlabs/Module/Toggle_mobile.php b/Zotlabs/Module/Toggle_mobile.php deleted file mode 100644 index 9d90c0821..000000000 --- a/Zotlabs/Module/Toggle_mobile.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -namespace Zotlabs\Module; - - -class Toggle_mobile extends \Zotlabs\Web\Controller { - - function init() { - - if(isset($_GET['off'])) - $_SESSION['show_mobile'] = false; - else - $_SESSION['show_mobile'] = true; - - if(isset($_GET['address'])) - $address = $_GET['address']; - else - $address = z_root(); - - goaway($address); - } - - -} diff --git a/Zotlabs/Module/Toggle_safesearch.php b/Zotlabs/Module/Toggle_safesearch.php deleted file mode 100644 index 2e9bc2575..000000000 --- a/Zotlabs/Module/Toggle_safesearch.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -namespace Zotlabs\Module; - - -class Toggle_safesearch extends \Zotlabs\Web\Controller { - - function init() { - - $observer = get_observer_hash(); - if (! $observer) - return; - - if($observer) - $safe_mode = get_xconfig($observer,'directory','safe_mode'); - if ($safe_mode == '') - set_xconfig($observer,'directory','safe_mode', '0'); - elseif($safe_mode == '0') - set_xconfig($observer,'directory','safe_mode', '1'); - elseif($safe_mode == '1') - set_xconfig($observer,'directory','safe_mode', '0'); - - if(isset($_GET['address'])) - $address = $_GET['address']; - else - $address = z_root() . '/directory'; - - goaway($address); - } - - -} diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 31f5de315..d10e40ed0 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -1,8 +1,11 @@ <?php -if(! function_exists("string_plural_select_es_es")) { -function string_plural_select_es_es($n){ - return ($n != 1 ? 1 : 0)}} +if(!function_exists("string_plural_select_es_es")) { + function string_plural_select_es_es($n) { + return ($n != 1 ? 1 : 0); + } +} + App::$rtl = 0; App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen."; |