Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

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
+}