Revision: 1447
http://mrbs.svn.sourceforge.net/mrbs/?rev=1447&view=rev
Author: cimorrison
Date: 2010-09-05 14:07:12 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/del_entry.php
mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
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-1443
+ /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-1446
Modified: mrbs/branches/provisional_bookings_new_style/web/del_entry.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/del_entry.php
2010-09-05 13:42:13 UTC (rev 1446)
+++ mrbs/branches/provisional_bookings_new_style/web/del_entry.php
2010-09-05 14:07:12 UTC (rev 1447)
@@ -63,7 +63,7 @@
// Get the settings for this area (they will be needed for policy checking)
get_area_settings($area);
- $notify_by_email = $mail_settings['admin_on_delete'] ||
$mail_settings['book_admin_on_approval'];
+ $notify_by_email = $mail_settings['admin_on_delete'] && $need_to_send_mail;
if ($notify_by_email)
{
Modified: mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-09-05 13:42:13 UTC (rev 1446)
+++ mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-09-05 14:07:12 UTC (rev 1447)
@@ -645,9 +645,8 @@
<label for="area_admin_email"><?php echo get_vocab("area_admin_email")
?>:</label>
<input type="text" id="area_admin_email" name="area_admin_email"
maxlength="75" value="<?php echo htmlspecialchars($row["area_admin_email"]);
?>">
</div>
- </fieldset>
- <?php
+ <?php
// The custom HTML
echo "<div>\n";
echo "<label for=\"area_custom_html\" title=\"" .
get_vocab("custom_html_note") . "\">" . get_vocab("custom_html") .
":</label>\n";
@@ -655,6 +654,8 @@
echo htmlspecialchars($row['custom_html']);
echo "</textarea>\n";
echo "</div>\n";
+
+ echo "</fieldset>\n";
if (!$enable_periods)
{
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-1443
+ /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-1446
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
