Merge remote-tracking branch 'upstream/master'

phpmyadmin · Jul 11, 2012 · e032d61 · e032d61
2 parents c1a8445 + c8e96d0
commit e032d61
Show file tree

Hide file tree

Showing 17 changed files with 1,893 additions and 1,176 deletions.
diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php
@@ -93,19 +93,6 @@ public function __construct($db)
         $this->_setSearchParams();
     }
 
-    /**
-     * Set CommmonFunctions
-     * 
-     * @param PMA_CommonFunctions $commonFunctions
-     * 
-     * @return void
-     */
-    public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
-    {
-        $this->_common_functions = $commonFunctions;
-    }
-
-
     /**
      * Get CommmonFunctions
      *