Merge branch 'dev'

1 files changed, 8 insertions, 19 deletions

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index ffe605538..015351cbf 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -84,20 +84,9 @@ class Network extends \Zotlabs\Web\Controller {
 
 		$search = (($_GET['search']) ? $_GET['search'] : '');
 		if($search) {
-			$_GET['netsearch'] = escape_tags($search);
-			if(strpos($search,'@') === 0) {
-				$r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1",
-					dbesc(substr($search,1)),
-					intval(local_channel())
-				);
-				if($r) {
-					$_GET['cid'] = $r[0]['abook_id'];
-					$search = $_GET['search'] = '';
-				}
-			}
-			elseif(strpos($search,'#') === 0) {
+			if(strpos($search,'#') === 0) {
 				$hashtags = substr($search,1);
-				$search = $_GET['search'] = '';
+				$search = '';
 			}
 		}
 	
@@ -108,7 +97,7 @@ class Network extends \Zotlabs\Web\Controller {
 		// filter by collection (e.g. group)
 	
 		if($gid) {
-			$r = q("SELECT * FROM groups WHERE id = %d AND uid = %d LIMIT 1",
+			$r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
 				intval($gid),
 				intval(local_channel())
 			);
@@ -143,7 +132,7 @@ class Network extends \Zotlabs\Web\Controller {
 		$deftag = '';
 	
 
-		if(x($_GET,'search') || $file || (!$pf && $cid))
+		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category)
 			$nouveau = true;
 
 		if($cid) {
@@ -169,9 +158,9 @@ class Network extends \Zotlabs\Web\Controller {
 		if(! $update) {
 	
 			// search terms header
-			if($search) {
+			if($search || $hashtags) {
 				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-					'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8')
+					'$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
 				));
 			}
 	
@@ -207,7 +196,7 @@ class Network extends \Zotlabs\Web\Controller {
 				$x['pretext'] = $deftag;
 	
 	
-			$status_editor = status_editor($a,$x);
+			$status_editor = status_editor($a,$x,false,'Network');
 			$o .= $status_editor;
 
 			$static = channel_manual_conv_update(local_channel());
@@ -448,7 +437,7 @@ class Network extends \Zotlabs\Web\Controller {
 		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
 		$uids = " and item.uid = " . local_channel() . " ";
 	
-		if(get_pconfig(local_channel(),'system','network_list_mode'))
+		if(feature_enabled(local_channel(), 'network_list_mode'))
 			$page_mode = 'list';
 		else
 			$page_mode = 'client';