Merged fixes for AS keywords MDL-7207

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index cbe9e6bf28cfef0300a576050858a2912222fbde..7ca4f942b8642e72b347641c1176153302679d06 100644 (file)
--- 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 e502c6178b8bb03a6ffc1a0b9273cba7a4d46104..ff1c3d6844532f279aa06c3ae73c196e9d4112d0 100755 (executable)
--- 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 7a6316da9e041ecef645bc21ae6e08ed36b31095..e5bea03dfc2a3e9e248a5b0c202b23db113a6626 100644 (file)
--- 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."',