aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-14 17:23:19 -0700
committerzotlabs <mike@macgirvin.com>2018-05-14 17:23:19 -0700
commit229d82c4c7ca37c304d1291be7f71ba4b0632f03 (patch)
tree9f0ce27c1e82380987dd9ea317d6bf8e516f7a6b /Zotlabs
parentd9759ba63c8fd70c4da66669389bd19bae3333ff (diff)
parent2d1dbc8f40d0b9fa89b99861fac30d579a400e34 (diff)
downloadvolse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.gz
volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.bz2
volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/MessageFilter.php4
-rw-r--r--Zotlabs/Module/Settings/Tokens.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php
index df59aa57e..eb0fc3d2c 100644
--- a/Zotlabs/Lib/MessageFilter.php
+++ b/Zotlabs/Lib/MessageFilter.php
@@ -23,7 +23,7 @@ class MessageFilter {
$lang = detect_language($text);
}
- $tags = ((count($item['term'])) ? $item['term'] : false);
+ $tags = ((is_array($item['term']) && count($item['term'])) ? $item['term'] : false);
// exclude always has priority
@@ -76,4 +76,4 @@ class MessageFilter {
}
-} \ No newline at end of file
+}
diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php
index bf22ec7aa..619c8b5ba 100644
--- a/Zotlabs/Module/Settings/Tokens.php
+++ b/Zotlabs/Module/Settings/Tokens.php
@@ -161,8 +161,8 @@ class Tokens {
'$me' => t('My Settings'),
'$perms' => $perms,
'$inherited' => t('inherited'),
- '$notself' => 0,
- '$self' => 1,
+ '$notself' => 1,
+ '$self' => 0,
'$permlbl' => t('Individual Permissions'),
'$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'),
'$submit' => t('Submit')
@@ -170,4 +170,4 @@ class Tokens {
return $o;
}
-} \ No newline at end of file
+}