MDL-7455 Database Activity Fatal Error after removing filed used for sorting

diff --git a/mod/data/view.php b/mod/data/view.php
index d6e1700f9bd46f89d9217c809731d7c57ea41688..755ba4d78768c6e75d84636b8ac67b5ec07b1623 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -293,9 +293,8 @@
     }
 
 /// Find the field we are sorting on
-    if ($sort) {
-        
-        $sortfield = data_get_field_from_id($sort, $data);
+    if ($sort and $sortfield = data_get_field_from_id($sort, $data)) {
+
         $sortcontent = $sortfield->get_sort_field();
         $sortcontentfull = $sortfield->get_sort_sql('c.'.$sortcontent);