From 8dacdd198e6bf0ec8dcd73b332fb79654d28fac1 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 12 Jun 2015 18:24:47 +0530
Subject: [PATCH] Move the column count obtaining logic to a separate method

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DBQbe.class.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
index 7befec0503..16329f4636 100644
--- a/libraries/DBQbe.class.php
+++ b/libraries/DBQbe.class.php
@@ -422,14 +422,7 @@ class PMA_DbQbe
      */
     private function _getSortOrderSelectCell($columnNumber, $sortOrder)
     {
-        $totalColumnCount = $this->_criteria_column_count;
-        if (! empty($this->_criteriaColumnInsert)) {
-            $totalColumnCount += count($this->_criteriaColumnInsert);
-        }
-        if (! empty($this->_criteriaColumnDelete)) {
-            $totalColumnCount -= count($this->_criteriaColumnDelete);
-        }
-
+        $totalColumnCount = $this->_getNewColumnCount();
         $html_output  = '<td class="center">';
         $html_output .= '<select name="criteriaSortOrder[' . $columnNumber . ']">';
         $html_output .= '<option value="1000">'
@@ -446,6 +439,23 @@ class PMA_DbQbe
         return $html_output;
     }
 
+    /**
+     * Returns the new column count after adding and removing columns as instructed
+     *
+     * @return int new column count
+     */
+    private function _getNewColumnCount()
+    {
+        $totalColumnCount = $this->_criteria_column_count;
+        if (! empty($this->_criteriaColumnInsert)) {
+            $totalColumnCount += count($this->_criteriaColumnInsert);
+        }
+        if (! empty($this->_criteriaColumnDelete)) {
+            $totalColumnCount -= count($this->_criteriaColumnDelete);
+        }
+        return $totalColumnCount;
+    }
+
     /**
      * Provides search form's row containing column select options
      *