From 3d81c41e2e8eb1b4338801a5d9a346d1e0c797e9 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 25 Oct 2006 08:51:32 +0000
Subject: [PATCH] Merged fixes for AS keywords   MDL-7207

---
 mod/chat/lib.php   | 6 +++---
 mod/data/lib.php   | 4 ++--
 mod/hotpot/lib.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index cbe9e6bf28..7ca4f942b8 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -178,9 +178,9 @@ function chat_print_recent_activity($course, $isteacher, $timestart) {
     $lastpingsearch = ($CFG->chat_method == 'sockets') ? '': 'AND cu.lastping > \''.$timeold.'\'';
 
     if (!$chatusers = get_records_sql("SELECT u.id, cu.chatid, u.firstname, u.lastname
-                                        FROM {$CFG->prefix}chat_users as cu,
-                                             {$CFG->prefix}chat as ch,
-                                             {$CFG->prefix}user as u
+                                        FROM {$CFG->prefix}chat_users cu,
+                                             {$CFG->prefix}chat ch,
+                                             {$CFG->prefix}user u
                                        WHERE cu.userid = u.id
                                          AND cu.chatid = ch.id $lastpingsearch
                                          AND ch.course = '$course->id'
diff --git a/mod/data/lib.php b/mod/data/lib.php
index e502c6178b..ff1c3d6844 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -697,8 +697,8 @@ function data_delete_instance($id) {    //takes the dataid
     /// Delete all the associated information
 
     // get all the records in this data
-    $sql = 'SELECT c.* FROM '.$CFG->prefix.'data_records as r LEFT JOIN '.
-           $CFG->prefix.'data_content as c ON c.recordid = r.id WHERE r.dataid = '.$id;
+    $sql = 'SELECT c.* FROM '.$CFG->prefix.'data_records r LEFT JOIN '.
+           $CFG->prefix.'data_content c ON c.recordid = r.id WHERE r.dataid = '.$id;
     
     if ($contents = get_records_sql($sql)){
 
diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index 7a6316da9e..e5bea03dfc 100644
--- a/mod/hotpot/lib.php
+++ b/mod/hotpot/lib.php
@@ -1264,7 +1264,7 @@ function hotpot_add_attempt($hotpotid) {
     // set all previous "in progress" attempts at this quiz to "abandoned"
     $db->Execute("
         UPDATE
-            {$CFG->prefix}hotpot_attempts as a
+            {$CFG->prefix}hotpot_attempts a
         SET
             a.timefinish = $timefinish,
             a.status = '".HOTPOT_STATUS_ABANDONED."',
-- 
2.39.5