X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_holiday.php;h=4db1e7553ffcba80d4bed4c31deb4a854a0e78b9;hp=6ad367aac8d33a5e19161628b1752938c3b71172;hb=c78089215285d52d483760699d07a96dfbbe0671;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 6ad367aac8..4db1e7553f 100644
--- 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)
 {