[Mrbs-commits] SF.net SVN: mrbs:[1486] mrbs/branches/provisional_bookings_new_style

[cimorrison]

Revision: 1486
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1486&view=rev
Author:   cimorrison
Date:     2010-10-05 07:47:50 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
Merged in latest changes from the trunk

Modified Paths:
--------------
    mrbs/branches/provisional_bookings_new_style/web/search.php

Property Changed:
----------------
    mrbs/branches/provisional_bookings_new_style/
    mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql


Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
Modified: svn:mergeinfo
   - /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1483
   + /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1485

Modified: mrbs/branches/provisional_bookings_new_style/web/search.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/search.php 2010-10-05 
07:45:24 UTC (rev 1485)
+++ mrbs/branches/provisional_bookings_new_style/web/search.php 2010-10-05 
07:47:50 UTC (rev 1486)
@@ -178,12 +178,12 @@
   echo "</div>\n";
   
   echo "<div id=\"record_nav\">\n";
+  $base_query_string = 
"search_str=$search_url&amp;total=$total&amp;from_year=$year&amp;from_month=$month&amp;from_day=$day";
   // display a "Previous" button if necessary
   if($has_prev)
   {
-    echo "<a href=\"search.php?search_str=$search_url&amp;search_pos=";
-    echo max(0, $search_pos-$search["count"]);
-    echo "&amp;total=$total&amp;year=$year&amp;month=$month&amp;day=$day\">";
+    $query_string = $base_query_string . "&amp;search_pos=" . max(0, 
$search_pos-$search["count"]);
+    echo "<a href=\"search.php?$query_string\">";
   }
 
   echo get_vocab("previous");
@@ -199,9 +199,8 @@
   // display a "Previous" button if necessary
   if ($has_next)
   {
-    echo "<a href=\"search.php?search_str=$search_url&amp;search_pos=";
-    echo max(0, $search_pos+$search["count"]);
-    echo "&amp;total=$total&amp;year=$year&amp;month=$month&amp;day=$day\">";
+    $query_string = $base_query_string . "&amp;search_pos=" . max(0, 
$search_pos+$search["count"]);
+    echo "<a href=\"search.php?$query_string\">";
   }
 
   echo get_vocab("next");


Property changes on: 
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1483
   + /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1485


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits