Revision: 1450
http://mrbs.svn.sourceforge.net/mrbs/?rev=1450&view=rev
Author: cimorrison
Date: 2010-09-14 16:04:51 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
- fixed bug which gave an invalid id message when editing a series with email
notifications turned on
- in the process changed the meaning of the $series parameter to mean that, if
true, the $id is an id from the repeat table; this brings it into line with
the rest of MRBS, except for del_entry.php which will have to be changed
sometime later.
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/edit_entry_handler.php
mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
Modified:
mrbs/branches/provisional_bookings_new_style/web/edit_entry_handler.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/edit_entry_handler.php
2010-09-06 23:47:34 UTC (rev 1449)
+++ mrbs/branches/provisional_bookings_new_style/web/edit_entry_handler.php
2010-09-14 16:04:51 UTC (rev 1450)
@@ -547,9 +547,9 @@
}
// If this is a modified entry then call
// getPreviousEntryData to prepare entry comparison.
- if ( isset($id) )
+ if (isset($id))
{
- $mail_previous = getPreviousEntryData($id, 1);
+ $mail_previous = getPreviousEntryData($repeat_id, TRUE);
}
$result = notifyAdminOnBooking(!isset($id), $new_id,
$booking['series']);
}
@@ -604,9 +604,9 @@
}
// If this is a modified entry then call
// getPreviousEntryData to prepare entry comparison.
- if ( isset($id) )
+ if (isset($id))
{
- $mail_previous = getPreviousEntryData($id, 0);
+ $mail_previous = getPreviousEntryData($id, FALSE);
}
$result = notifyAdminOnBooking(!isset($id), $new_id, ($edit_type ==
"series"));
}
Modified: mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-09-06 23:47:34 UTC (rev 1449)
+++ mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-09-14 16:04:51 UTC (rev 1450)
@@ -820,7 +820,8 @@
* entry state.
*
* @param int $id entry id to get data
- * @param int $series 1 if this is a series or 0
+ * @param int $series TRUE if this is the id of an entry in the repeat
table
+ FALSE if this is the id of an entry in the entry
table
* @return bool TRUE or PEAR error object if fails
*/
function getPreviousEntryData($id, $series)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
