From e528483d8150b1495e96de5309ed383a5fd6e09b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Jan 2015 14:42:54 -0800
Subject: hide friends broken, add parameter for item search by verb

---
 mod/channel.php  | 1 +
 mod/display.php  | 1 +
 mod/home.php     | 1 +
 mod/network.php  | 1 +
 mod/profiles.php | 4 ++--
 mod/search.php   | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'mod')

diff --git a/mod/channel.php b/mod/channel.php
index e819de0e0..c8ac83baf 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -286,6 +286,7 @@ function channel_content(&$a, $update = 0, $load = false) {
 			'$cats' => (($category) ? $category : ''),
 			'$tags' => (($hashtags) ? $hashtags : ''),
 			'$mid' => $mid,
+			'$verb' => '',
 			'$dend' => $datequery,
 			'$dbegin' => $datequery2
 		));
diff --git a/mod/display.php b/mod/display.php
index 7d7f4ca13..f14aca6da 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -136,6 +136,7 @@ function display_content(&$a, $update = 0, $load = false) {
 			'$tags' => '',
 			'$dend' => '',
 			'$dbegin' => '',
+			'$verb' => '',
 			'$mid' => $item_hash
 		));
 
diff --git a/mod/home.php b/mod/home.php
index b2538795f..e82aab385 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -144,6 +144,7 @@ function home_content(&$a, $update = 0, $load = false) {
 					'$tags'    => '',
 					'$dend'    => '',
 					'$mid'     => '',
+					'$verb'     => '',
 					'$dbegin'  => ''
 				));
 			}
diff --git a/mod/network.php b/mod/network.php
index d444dbd59..894ea9c10 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -251,6 +251,7 @@ function network_content(&$a, $update = 0, $load = false) {
 			'$tags'    => $hashtags,
 			'$dend'    => $datequery,
 			'$mid'     => '',
+			'$verb'     => '',
 			'$dbegin'  => $datequery2
 		));
 	}
diff --git a/mod/profiles.php b/mod/profiles.php
index fa6a6e35c..a426b7aa1 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -296,7 +296,7 @@ function profiles_post(&$a) {
 		$work         = fix_mce_lf(escape_tags(trim($_POST['work'])));
 		$education    = fix_mce_lf(escape_tags(trim($_POST['education'])));
 
-		$hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0);
+		$hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
 
 		$with         = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
 
@@ -605,7 +605,7 @@ function profiles_content(&$a) {
 
 		$opt_tpl = get_markup_template("profile_hide_friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array('$field' => array(
-                       'hide-friends',
+                       'hide_friends',
                        t('Hide your contact/friend list from viewers of this profile?'),
                        $r[0]['hide_friends'],
                        '',
diff --git a/mod/search.php b/mod/search.php
index 6df9d631a..2ea6ad86f 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -109,6 +109,7 @@ function search_content(&$a,$update = 0, $load = false) {
 			'$cats' => '',
 			'$tags' => '',
 			'$mid' => '',
+			'$verb' => '',
 			'$dend' => '',
 			'$dbegin' => ''
 		));
-- 
cgit v1.2.3