Revision: 1562
http://mrbs.svn.sourceforge.net/mrbs/?rev=1562&view=rev
Author: cimorrison
Date: 2010-11-02 09:00:54 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/functions.inc
mrbs/branches/provisional_bookings_new_style/web/mrbs_sql.inc
mrbs/branches/provisional_bookings_new_style/web/upgrade/15/pgsql.sql
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-1556
+ /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-1561
Modified: mrbs/branches/provisional_bookings_new_style/web/functions.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/functions.inc
2010-11-01 19:32:07 UTC (rev 1561)
+++ mrbs/branches/provisional_bookings_new_style/web/functions.inc
2010-11-02 09:00:54 UTC (rev 1562)
@@ -11,7 +11,7 @@
{
if (function_exists("date_default_timezone_set"))
{
- date_default_timezone_set($timezone);
+ date_default_timezone_set($timezone) or die("Configuration error: invalid
timezone.");
}
else
{
Modified: mrbs/branches/provisional_bookings_new_style/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/mrbs_sql.inc
2010-11-01 19:32:07 UTC (rev 1561)
+++ mrbs/branches/provisional_bookings_new_style/web/mrbs_sql.inc
2010-11-02 09:00:54 UTC (rev 1562)
@@ -699,8 +699,7 @@
// First update the repeat table
$sql = "UPDATE $tbl_repeat
SET status=status&". ~STATUS_AWAITING_APPROVAL . "
- WHERE id=$id
- LIMIT 1";
+ WHERE id=$id";
if (sql_command($sql) > 0) // We expect there to be one row affected
{
// Then update the entry table
@@ -720,8 +719,7 @@
{
$sql = "UPDATE $tbl_entry
SET status=status&". ~STATUS_AWAITING_APPROVAL . "
- WHERE id=$id
- LIMIT 1";
+ WHERE id=$id";
return (sql_command($sql) > 0); // We expect there to be one row affected
}
}
Modified: mrbs/branches/provisional_bookings_new_style/web/upgrade/15/pgsql.sql
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/upgrade/15/pgsql.sql
2010-11-01 19:32:07 UTC (rev 1561)
+++ mrbs/branches/provisional_bookings_new_style/web/upgrade/15/pgsql.sql
2010-11-02 09:00:54 UTC (rev 1562)
@@ -1 +0,0 @@
--- $Id$
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-1556
+ /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-1561
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
