Merged SQL fixes from stable

diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php
index c4732653827dfba8955c1c61c52b14055d2f857b..6027dbdde7a6332992f315f4a73b06b527acae4f 100644 (file)
--- 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 bd24cb0aa5e59fe850c3de6a67d8bd3a8a26d32f..5f613960147ae0d17f024ee8d778f0ff3a2701c6 100644 (file)
--- 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