aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-16 05:51:04 -0700
committerfriendica <info@friendica.com>2012-03-16 05:51:04 -0700
commit224dfa848bf2659ba038b6e519692d3755eb7bed (patch)
tree260c9781b3911844e3448fa633a0536a21c90070
parent805087af678f922ad75535fa8dbe0fc86d9cd566 (diff)
downloadvolse-hubzilla-224dfa848bf2659ba038b6e519692d3755eb7bed.tar.gz
volse-hubzilla-224dfa848bf2659ba038b6e519692d3755eb7bed.tar.bz2
volse-hubzilla-224dfa848bf2659ba038b6e519692d3755eb7bed.zip
bug #335 network search broken after new ssl policy settings
-rw-r--r--include/text.php2
-rwxr-xr-xmod/network.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index d34fd7fbe..cdf82ca87 100644
--- a/include/text.php
+++ b/include/text.php
@@ -638,7 +638,7 @@ if(! function_exists('search')) {
function search($s,$id='search-box',$url='/search',$save = false) {
$a = get_app();
$o = '<div id="' . $id . '">';
- $o .= '<form action="' . $a->get_baseurl() . $url . '" method="get" >';
+ $o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
$o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />';
if($save)
diff --git a/mod/network.php b/mod/network.php
index d0f1733f4..9ec8c23b5 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -90,7 +90,7 @@ function saved_searches($search) {
$o = replace_macros($tpl, array(
'$title' => t('Saved Searches'),
'$add' => t('add'),
- '$searchbox' => search($search,'netsearch-box',$a->get_baseurl(true) . $srchurl,true),
+ '$searchbox' => search($search,'netsearch-box',$srchurl,true),
'$saved' => $saved,
));