From 7a2c8b00d66f353913a2c072c090dd701b9a7959 Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 29 Sep 2004 07:56:33 +0000 Subject: [PATCH] Merged SQL fixes from stable --- mod/forum/rsslib.php | 34 +++++++++++++++++----------------- mod/glossary/rsslib.php | 32 ++++++++++++++++---------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php index c473265382..6027dbdde7 100644 --- a/mod/forum/rsslib.php +++ b/mod/forum/rsslib.php @@ -163,14 +163,14 @@ $newsince = ""; } - if ($recs = get_records_sql ("SELECT d.id discussionid, - d.name discussionname, - u.id userid, - u.firstname userfirstname, - u.lastname userlastname, - p.message postmessage, - p.created postcreated, - p.format postformat + if ($recs = get_records_sql ("SELECT d.id AS discussionid, + d.name AS discussionname, + u.id AS userid, + u.firstname AS userfirstname, + u.lastname AS userlastname, + p.message AS postmessage, + p.created AS postcreated, + p.format AS postformat FROM {$CFG->prefix}forum_discussions d, {$CFG->prefix}forum_posts p, {$CFG->prefix}user u @@ -223,15 +223,15 @@ $newsince = ""; } - if ($recs = get_records_sql ("SELECT p.id postid, - d.id discussionid, - u.id userid, - u.firstname userfirstname, - u.lastname userlastname, - p.subject postsubject, - p.message postmessage, - p.created postcreated, - p.format postformat + if ($recs = get_records_sql ("SELECT p.id AS postid, + d.id AS discussionid, + u.id AS userid, + u.firstname AS userfirstname, + u.lastname AS userlastname, + p.subject AS postsubject, + p.message AS postmessage, + p.created AS postcreated, + p.format AS postformat FROM {$CFG->prefix}forum_discussions d, {$CFG->prefix}forum_posts p, {$CFG->prefix}user u diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php index bd24cb0aa5..5f61396014 100644 --- a/mod/glossary/rsslib.php +++ b/mod/glossary/rsslib.php @@ -163,14 +163,14 @@ $newsince = ""; } - if ($recs = get_records_sql ("SELECT e.id entryid, - e.concept entryconcept, - e.definition entrydefinition, - e.format entryformat, - e.timecreated entrytimecreated, - u.id userid, - u.firstname userfirstname, - u.lastname userlastname + if ($recs = get_records_sql ("SELECT e.id AS entryid, + e.concept AS entryconcept, + e.definition AS entrydefinition, + e.format AS entryformat, + e.timecreated AS entrytimecreated, + u.id AS userid, + u.firstname AS userfirstname, + u.lastname AS userlastname FROM {$CFG->prefix}glossary_entries e, {$CFG->prefix}user u WHERE e.glossaryid = '$glossary->id' AND @@ -220,14 +220,14 @@ $newsince = ""; } - if ($recs = get_records_sql ("SELECT e.id entryid, - e.concept entryconcept, - e.definition entrydefinition, - e.format entryformat, - e.timecreated entrytimecreated, - u.id userid, - u.firstname userfirstname, - u.lastname userlastname + if ($recs = get_records_sql ("SELECT e.id AS entryid, + e.concept AS entryconcept, + e.definition AS entrydefinition, + e.format AS entryformat, + e.timecreated AS entrytimecreated, + u.id AS userid, + u.firstname AS userfirstname, + u.lastname AS userlastname FROM {$CFG->prefix}glossary_entries e, {$CFG->prefix}user u WHERE e.glossaryid = '$glossary->id' AND -- 2.39.5