Revision: 1566
http://mrbs.svn.sourceforge.net/mrbs/?rev=1566&view=rev
Author: cimorrison
Date: 2010-11-02 11:30:57 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/upgrade/15/post.inc
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-1561
+ /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-1565
Modified: mrbs/branches/provisional_bookings_new_style/web/upgrade/15/post.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/upgrade/15/post.inc
2010-11-02 11:27:15 UTC (rev 1565)
+++ mrbs/branches/provisional_bookings_new_style/web/upgrade/15/post.inc
2010-11-02 11:30:57 UTC (rev 1566)
@@ -28,13 +28,13 @@
$sql_val = "'" . addslashes($area_defaults[$key]) . "'";
}
$sql = "UPDATE $tbl_area SET $key=$sql_val WHERE $key IS NULL";
+ $res = sql_command($sql);
+ if ($res == -1)
+ {
+ // No need to localise, should never happen
+ print "<span class=\"error\">Failed to set default value for column
'$key' in area table.</span><br>";
+ }
}
- $res = sql_command($sql);
- if ($res == -1)
- {
- // No need to localise, should never happen
- print "<span class=\"error\">Failed to set default value for column '$key'
in area table.</span><br>";
- }
}
?>
\ No newline at end of file
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-1561
+ /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-1565
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
