bug #335 network search broken after new ssl policy settings

diff --git a/include/text.php b/include/text.php
index d34fd7fbeec35bcacfb5a1bd2fa201a3e770d692..cdf82ca87dfe7f4e48c7df146ea9e293c186d0e9 100644 (file)
--- 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 d0f1733f46120e5c6cec659491ddda9cc17b8398..9ec8c23b5904ed81850afb2ee8a8986e19b0c07c 100755 (executable)
--- 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,
        ));