Revision: 2288
http://mrbs.svn.sourceforge.net/mrbs/?rev=2288&view=rev
Author: jberanek
Date: 2012-04-10 10:32:08 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
* Fixed infinite loop in mrbs_default_timezone_set() when $timezone
configuratation variable wasn't set.
* Added missing 'global' definition in generate_trailer().
Modified Paths:
--------------
mrbs/trunk/web/functions.inc
mrbs/trunk/web/trailer.inc
Modified: mrbs/trunk/web/functions.inc
===================================================================
--- mrbs/trunk/web/functions.inc 2012-04-10 09:58:31 UTC (rev 2287)
+++ mrbs/trunk/web/functions.inc 2012-04-10 10:32:08 UTC (rev 2288)
@@ -14,7 +14,7 @@
// to prevent people running into DST problems
$message = 'Configuration error: $timezone has not been set.';
trigger_error($message, E_USER_WARNING);
- fatal_error(TRUE, $message);
+ fatal_error(FALSE, $message);
}
else
{
@@ -615,7 +615,7 @@
function fatal_error($need_header, $message, $show_form_data = true)
{
global $simple_trailer, $weekstarts, $view_week_number, $strftime_format;
-
+
if ($need_header)
{
print_header(0, 0, 0, 0, "");
Modified: mrbs/trunk/web/trailer.inc
===================================================================
--- mrbs/trunk/web/trailer.inc 2012-04-10 09:58:31 UTC (rev 2287)
+++ mrbs/trunk/web/trailer.inc 2012-04-10 10:32:08 UTC (rev 2288)
@@ -4,8 +4,8 @@
function generate_trailer()
{
- global $year, $month, $day, $area, $room, $simple_trailer;
- global $strftime_format;
+ global $year, $month, $day, $area, $room;
+ global $strftime_format, $weekstarts, $simple_trailer;
$output = "";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
