From a0f6c46292e82ff2eb6e0e5f6c525f52d6bb0a34 Mon Sep 17 00:00:00 2001
From: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
Date: Mon, 6 Oct 2014 10:42:50 +0530
Subject: [PATCH] Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
---
 libraries/TableSearch.class.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
index cb4febf8cd..0ba11bf645 100644
--- a/libraries/TableSearch.class.php
+++ b/libraries/TableSearch.class.php
@@ -258,13 +258,11 @@ class PMA_TableSearch
      * @param int    $foreignMaxLimit     Max limit of displaying foreign elements
      * @param array  $criteriaValues      Array of search criteria inputs
      * @param string $column_id           Column's inputbox's id
-     * @param bool   $in_zoom_search_edit Whether we are in zoom search edit
      *
      * @return string HTML elements.
      */
     private function _getForeignKeyInputBox($foreignData, $column_name,
-        $column_index, $titles, $foreignMaxLimit, $criteriaValues, $column_id,
-        $in_zoom_search_edit = false
+        $column_index, $titles, $foreignMaxLimit, $criteriaValues, $column_id
     ) {
         $html_output = '';
         if (is_array($foreignData['disp_row'])) {
@@ -532,14 +530,13 @@ EOT;
      * @param mixed  $criteriaValues Search criteria input
      * @param string $names          Name of the column on which search is submitted
      * @param string $types          Type of the field
-     * @param string $collations     Field collation
      * @param string $func_type      Search function/operator
      * @param bool   $unaryFlag      Whether operator unary or not
      * @param bool   $geom_func      Whether geometry functions should be applied
      *
      * @return string generated where clause.
      */
-    private function _getWhereClause($criteriaValues, $names, $types, $collations,
+    private function _getWhereClause($criteriaValues, $names, $types,
         $func_type, $unaryFlag, $geom_func = null
     ) {
         // If geometry function is set
@@ -705,14 +702,12 @@ EOT;
         }
 
         // else continue to form the where clause from column criteria values
-        $fullWhereClause = $charsets = array();
+        $fullWhereClause = array();
         reset($_POST['criteriaColumnOperators']);
         while (list($column_index, $operator) = each(
             $_POST['criteriaColumnOperators']
         )) {
-            list($charsets[$column_index]) = explode(
-                '_', $_POST['criteriaColumnCollations'][$column_index]
-            );
+
             $unaryFlag =  $GLOBALS['PMA_Types']->isUnaryOperator($operator);
             $tmp_geom_func = isset($geom_func[$column_index])
                 ? $geom_func[$column_index] : null;
@@ -721,7 +716,6 @@ EOT;
                 $_POST['criteriaValues'][$column_index],
                 $_POST['criteriaColumnNames'][$column_index],
                 $_POST['criteriaColumnTypes'][$column_index],
-                $_POST['criteriaColumnCollations'][$column_index],
                 $operator,
                 $unaryFlag,
                 $tmp_geom_func