From 201b7446508ffb4c9092d11af592fce79fe28e19 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 17:19:53 +0530
Subject: [PATCH] Remove id from display options slider

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php |  2 +-
 libraries/Util.class.php           | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 57cfbb1f30..0c72fc7b54 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1624,7 +1624,7 @@ class PMA_DisplayResults
         $options_html .= PMA_URL_getHiddenInputs($url_params)
             . '<br />'
             . PMA_Util::getDivForSliderEffect(
-                'displayoptions', __('Options')
+                '', __('Options')
             )
             . '<fieldset>';
 
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index fd93109269..c06d7755da 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2722,10 +2722,10 @@ class PMA_Util
      * @return string         html div element
      *
      */
-    public static function getDivForSliderEffect($id, $message)
+    public static function getDivForSliderEffect($id = '', $message = '')
     {
         if ($GLOBALS['cfg']['InitialSlidersState'] == 'disabled') {
-            return '<div id="' . $id . '">';
+            return '<div' . ($id ? ' id="' . $id . '"' : '') . '>';
         }
         /**
          * Bad hack on the next line. document.write() conflicts with jQuery,
@@ -2736,11 +2736,14 @@ class PMA_Util
          * append to
          */
 
-        return '<div id="' . $id . '"'
+        return '<div'
+             . ($id ? ' id="' . $id . '"' : '')
             . (($GLOBALS['cfg']['InitialSlidersState'] == 'closed')
                 ? ' style="display: none; overflow:auto;"'
                 : '')
-            . ' class="pma_auto_slider" title="' . htmlspecialchars($message) . '">';
+            . ' class="pma_auto_slider"'
+            . ($message ? ' title="' . htmlspecialchars($message) . '"' : '')
+            . '>';
     }
 
     /**