MDL-51315 tablelib: Only display table preferences if necessary.

A thank you to Tony Butler for a solution to this issue.

diff --git a/lib/tablelib.php b/lib/tablelib.php
index c348e1f..06516e9 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1419,6 +1419,21 @@ class flexible_table {
      * @return string HTML fragment.
      */
     private function render_reset_button() {
+        $userprefs = false;
+        // Loop through the user table preferences for a setting.
+        foreach ($this->prefs as $preference) {
+            if (!empty($preference)) {
+                // We have a preference.
+                $userprefs = true;
+                // We only need one.
+                break;
+            }
+        }
+        // If no table preferences have been set then don't show the reset button.
+        if (!$userprefs) {
+            return '';
+        }
+
         $url = $this->baseurl->out(false, array($this->request[TABLE_VAR_RESET] => 1));
 
         $html  = html_writer::start_div('mdl-right');