diff options
author | friendica <info@friendica.com> | 2015-01-13 14:42:54 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-13 14:42:54 -0800 |
commit | e528483d8150b1495e96de5309ed383a5fd6e09b (patch) | |
tree | 82530251317ddf9bdff63bbba0858fd55bd5946f | |
parent | 2fc0d641393a56f056e50af65c82147a6a392f85 (diff) | |
download | volse-hubzilla-e528483d8150b1495e96de5309ed383a5fd6e09b.tar.gz volse-hubzilla-e528483d8150b1495e96de5309ed383a5fd6e09b.tar.bz2 volse-hubzilla-e528483d8150b1495e96de5309ed383a5fd6e09b.zip |
hide friends broken, add parameter for item search by verb
-rw-r--r-- | mod/channel.php | 1 | ||||
-rw-r--r-- | mod/display.php | 1 | ||||
-rw-r--r-- | mod/home.php | 1 | ||||
-rw-r--r-- | mod/network.php | 1 | ||||
-rw-r--r-- | mod/profiles.php | 4 | ||||
-rw-r--r-- | mod/search.php | 1 | ||||
-rwxr-xr-x | view/tpl/build_query.tpl | 2 |
7 files changed, 9 insertions, 2 deletions
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' => '' )); diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 8110b70b1..62f81b618 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -26,6 +26,7 @@ var bParam_dend = "{{$dend}}"; var bParam_dbegin = "{{$dbegin}}"; var bParam_mid = "{{$mid}}"; + var bParam_verb = "{{$verb}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -51,6 +52,7 @@ if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; + if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; return(bCmd); } |