MDL-15702 SQL efficiency fix Merged from 1.9

diff --git a/mod/data/view.php b/mod/data/view.php
index d9d750cb5880c93c106ce128155149c14529b07b..983893c4bc694dc18ee36a05a8f090ae03e24536 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -514,7 +514,7 @@
                         continue;
                     }
                     $tables .= ', {data_content} c'.$key.' ';
-                    $where .= ' AND c'.$key.'.recordid = r.id';
+                    $where .= ' AND c'.$key.'.recordid = r.id AND c'.$key.'.fieldid = '.$key;
                     $searchselect .= ' AND ('.$val->sql.') ';
                     $params = array_merge($params, $val->params);
                 }