[Mrbs-commits] SF.net SVN: mrbs:[1689] mrbs/branches/ics_attachments

[cimorrison]

Revision: 1689
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1689&view=rev
Author:   cimorrison
Date:     2010-12-10 09:37:35 +0000 (Fri, 10 Dec 2010)

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

Modified Paths:
--------------
    mrbs/branches/ics_attachments/web/functions.inc

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


Property changes on: mrbs/branches/ics_attachments
___________________________________________________________________
Modified: svn:mergeinfo
   - /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1675
   + /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1688

Modified: mrbs/branches/ics_attachments/web/functions.inc
===================================================================
--- mrbs/branches/ics_attachments/web/functions.inc     2010-12-10 08:53:12 UTC 
(rev 1688)
+++ mrbs/branches/ics_attachments/web/functions.inc     2010-12-10 09:37:35 UTC 
(rev 1689)
@@ -940,7 +940,7 @@
       $out_html .= "<ul>\n";
       for ($i = 0; ($row = sql_row_keyed($res, $i)); $i++)
       {
-        $out_html .= "<li><a 
href=\"week.php?year=$year&amp;month=$month&amp;day=$day&amp;area=${row['id']}\">";
+        $out_html .= "<li><a 
href=\"$link?year=$year&amp;month=$month&amp;day=$day&amp;area=${row['id']}\">";
         $out_html .= "<span" . (($row['id'] == $current) ? ' class="current"' 
: '') . ">";
         $out_html .= htmlspecialchars($row['area_name']) . 
"</span></a></li>\n";
       }
@@ -997,7 +997,7 @@
       $out_html .= "<ul>\n";
       for ($i = 0; ($row = sql_row_keyed($res, $i)); $i++)
       {
-        $out_html .= "<li><a 
href=\"month.php?year=$year&amp;month=$month&amp;day=$day&amp;area=$area&amp;room=".$row['id']."\">";
+        $out_html .= "<li><a 
href=\"$link?year=$year&amp;month=$month&amp;day=$day&amp;area=$area&amp;room=".$row['id']."\">";
         $out_html .= "<span" . (($row['id'] == $current) ? ' class="current"' 
: '') . ">";
         $out_html .= htmlspecialchars($row['room_name']) . 
"</span></a></li>\n";
       }


Property changes on: mrbs/branches/ics_attachments/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/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1675
   + /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1688


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

------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits