Revision: 2154
http://mrbs.svn.sourceforge.net/mrbs/?rev=2154&view=rev
Author: cimorrison
Date: 2011-11-01 15:37:49 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Fixed bug which meant that the day, week and month views were displayed in the
wrong locale (bug introduced in Revs 2150 and 2151)
Modified Paths:
--------------
mrbs/trunk/web/day.php
mrbs/trunk/web/functions_table.inc
mrbs/trunk/web/month.php
mrbs/trunk/web/week.php
Modified: mrbs/trunk/web/day.php
===================================================================
--- mrbs/trunk/web/day.php 2011-10-31 07:34:14 UTC (rev 2153)
+++ mrbs/trunk/web/day.php 2011-11-01 15:37:49 UTC (rev 2154)
@@ -1,9 +1,9 @@
<?php
// $Id$
-require_once "functions_table.inc";
require_once "defaultincludes.inc";
require_once "mincals.inc";
+require_once "functions_table.inc";
// Get non-standard form variables
$timetohighlight = get_form_var('timetohighlight', 'int');
Modified: mrbs/trunk/web/functions_table.inc
===================================================================
--- mrbs/trunk/web/functions_table.inc 2011-10-31 07:34:14 UTC (rev 2153)
+++ mrbs/trunk/web/functions_table.inc 2011-11-01 15:37:49 UTC (rev 2154)
@@ -2,8 +2,6 @@
// $Id$
-require_once "theme.inc";
-
function map_add_booking ($row, &$column, $am7, $pm7, $format)
{
// Enters the contents of the booking found in $row into $column, which is
Modified: mrbs/trunk/web/month.php
===================================================================
--- mrbs/trunk/web/month.php 2011-10-31 07:34:14 UTC (rev 2153)
+++ mrbs/trunk/web/month.php 2011-11-01 15:37:49 UTC (rev 2154)
@@ -3,9 +3,9 @@
// mrbs/month.php - Month-at-a-time view
-require_once "functions_table.inc";
require_once "defaultincludes.inc";
require_once "mincals.inc";
+require_once "functions_table.inc";
$debug_flag = get_form_var('debug_flag', 'int');
Modified: mrbs/trunk/web/week.php
===================================================================
--- mrbs/trunk/web/week.php 2011-10-31 07:34:14 UTC (rev 2153)
+++ mrbs/trunk/web/week.php 2011-11-01 15:37:49 UTC (rev 2154)
@@ -3,9 +3,9 @@
// mrbs/week.php - Week-at-a-time view
-require_once "functions_table.inc";
require_once "defaultincludes.inc";
require_once "mincals.inc";
+require_once "functions_table.inc";
// Get non-standard form variables
$timetohighlight = get_form_var('timetohighlight', 'int');
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA® Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
