[Comoblog-commit] comoblog/modules/mod_search mod_search.php,1.2,1.3 search_results.php,1.1,1.2

[Mark W. \(a. serialmonkey\) <mar...@us...>]

Update of /cvsroot/comoblog/comoblog/modules/mod_search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9196

Modified Files:
	mod_search.php search_results.php 
Log Message:
1361701 - Fixed site_url issues and search results after post deletion

Index: mod_search.php
===================================================================
RCS file: /cvsroot/comoblog/comoblog/modules/mod_search/mod_search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mod_search.php	9 Oct 2005 08:28:37 -0000	1.2
+++ mod_search.php	25 Nov 2005 04:31:16 -0000	1.3
@@ -1,7 +1,7 @@
 <?php
 $mod_contents = '<div id="mod_blog_search"><table width="100%" border="0" cellspacing="0" cellpadding="0">';
 $mod_contents .= '<tr><td><p>';
-$mod_contents .= '<form action="./modules/mod_search/search_results.php" method="post">';
+$mod_contents .= '<form action="'.CFG_SITE_URL.'/modules/mod_search/search_results.php" method="post">';
 $mod_contents .= 'Search: <br>';
 $mod_contents .= '<input type="text" name="search_txt"><br>';
 $mod_contents .= '<input type="submit" name="search_but" value="search">';

Index: search_results.php
===================================================================
RCS file: /cvsroot/comoblog/comoblog/modules/mod_search/search_results.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- search_results.php	5 Oct 2005 00:48:15 -0000	1.1
+++ search_results.php	25 Nov 2005 04:31:16 -0000	1.2
@@ -25,11 +25,13 @@
 
 $tpl = new XTemplate (CFG_BASE_PATH."/modules/mod_search/templates/search_results.tpl.htm", "main");
 
+$tpl->assign ('SITE_URL', CFG_SITE_URL);
+$tpl->parse('main.title');
+
 $search_string = $_POST['search_txt'];
 $posts = do_search ($search_string);
 $page_title = "Search Results for '".$search_string."'";
 $tpl->assign ('PAGE_TITLE', $page_title);
-$tpl->assign ('SITE_URL', CFG_SITE_URL);
 
 if ($posts) {
    //for ($c = 0; $c < count($posts); $c++) {
@@ -89,26 +91,6 @@
 }
 
 
-// modules ////////////////////////////////////////////////////////////////////
-//
-   if (count($SIDEBAR_MODULES) > 0) {
-      for ($mod_cnt = 0; $mod_cnt < count($SIDEBAR_MODULES); $mod_cnt++) {
-         include_once (CFG_BASE_PATH.'/modules/'.$SIDEBAR_MODULES[$mod_cnt].'/'.$SIDEBAR_MODULES[$mod_cnt].'.php');
-         $tpl->assign('SIDEBAR_MODULE',$mod_contents);
-         $tpl->parse('main.sidebar_module');
-      }
-   }
-   if (count($TOP_MODULES) > 0) {
-      for ($mod_cnt = 0; $mod_cnt < count($TOP_MODULES); $mod_cnt++) {
-         include_once (CFG_BASE_PATH.'/modules/'.$TOP_MODULES[$mod_cnt].'/'.$TOP_MODULES[$mod_cnt].'.php');
-         $tpl->assign('TOP_MODULE',$mod_contents);
-         $tpl->parse('main.top_bar.top_module');
-      }
-      $tpl->parse('main.top_bar');
-   }
-//
-///////////////////////////////////////////////////////////////////////////////
-
 
 $tpl->parse('main');
 $tpl->out('main');