mail not sent to area/room admins

I've found that after setting the following TRUE in
config.inc.php:

MAIL_AREA_ADMIN_ON_BOOKINGS
MAIL_ROOM_ADMIN_ON_BOOKINGS

mail is still not sent to the area and room admins
UNLESS an entry was repeating. This is the result of a
query for the email addresses in function
notifyAdminOnBooking (in functions_mail.inc) always
including the repeat table in the FROM clause so when
there's no match in the repeat table, the result is
null. One way to fix this would be to replace the
following line (after the test for
MAIL_AREA_ADMIN_ON_BOOKINGS):

$sql .= "FROM $tbl_room r, $tbl_area a, $tbl_entry e,
$tbl_repeat rep ";

with these two lines:

$sql .= "FROM $tbl_room r, $tbl_area a, $tbl_entry e ";
if ($id_table == 'rep') // is this a repeating entry?
$sql .= ",$tbl_repeat rep "; // yes, use rep tbl

and replace the following line (after the test for
MAIL_ROOM_ADMIN_ON_BOOKINGS):

$sql .= "FROM $tbl_room r, $tbl_entry e, $tbl_repeat rep ";

with these two lines:

$sql .= "FROM $tbl_room r, $tbl_entry e ";
if ($id_table == 'rep') // is this a repeating entry?
$sql .= ",$tbl_repeat rep "; // yes, use rep tbl