From ea3447ed8ebc40e3733f3cdcda35ff8aa266c36a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 6 Apr 2014 08:56:53 -0400
Subject: [PATCH] Previous fix for notices was incorrect

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/DisplayResults.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 0cd61446b3..d373349e35 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -2001,7 +2001,6 @@ class PMA_DisplayResults
                 );
             } else {
                 $sort_order .= strtoupper($sort_direction[$index]);
-                $order_img = '';
             }
             // Separate columns by a comma
             $sort_order .= ", ";
@@ -2010,6 +2009,9 @@ class PMA_DisplayResults
         // remove the comma from the last column name in the newly
         // constructed clause
         $sort_order = substr($sort_order, 0, strlen($sort_order)-2);
+        if (empty($order_img)) {
+            $order_img = '';
+        }
         return array($sort_order, $order_img);
     }