Some functions rewritten to hungarian notation, handling of array rewritten

[mailer.git] / inc / modules / admin / what-list_holiday.php

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 6ad367aac8d33a5e19161628b1752938c3b71172..713b45fcf497d2fc52ffee346a2e625c70c5ffa1 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -38,10 +38,14 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Start listing holiday requests
-$result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online FROM "._MYSQL_PREFIX."_user_holidays AS h, "._MYSQL_PREFIX."_user_data AS d WHERE h.userid=d.userid ORDER BY h.userid", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
+FROM "._MYSQL_PREFIX."_user_holidays AS h
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+ON h.userid=d.userid
+ORDER BY h.userid", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0)
 {