Prevent some false-positives detecting uses of old user_XXX tables.

See http://moodle.org/mod/forum/discuss.php?d=58976

Merged from MOODLE_17_STABLE

diff --git a/lib/dmllib.php b/lib/dmllib.php
index 78893cdac4ee7b1ec9b05b50e0ea20b676ae4d15..e543ae08d8dfb84b383a03129582e5cea09962ec 100644 (file)
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -635,10 +635,10 @@ function get_recordset_sql($sql, $limitfrom=null, $limitnum=null) {
 
 /// Temporary hack as part of phasing out all access to obsolete user tables  XXX
     if (!empty($CFG->rolesactive)) {
-        if (strpos($sql, $CFG->prefix.'user_students') || 
-            strpos($sql, $CFG->prefix.'user_teachers') ||
-            strpos($sql, $CFG->prefix.'user_coursecreators') ||
-            strpos($sql, $CFG->prefix.'user_admins')) {
+        if (strpos($sql, ' '.$CFG->prefix.'user_students ') || 
+            strpos($sql, ' '.$CFG->prefix.'user_teachers ') ||
+            strpos($sql, ' '.$CFG->prefix.'user_coursecreators ') ||
+            strpos($sql, ' '.$CFG->prefix.'user_admins ')) {
             if (debugging()) { var_dump(debug_backtrace()); }
             error('This SQL relies on obsolete tables!  Your code must be fixed by a developer.');
         }