[phpwiki-checkins] SF.net SVN: phpwiki:[9033] trunk/lib/EditToolbar.php

[<var...@us...>]

Revision: 9033
          http://sourceforge.net/p/phpwiki/code/9033
Author:   vargenau
Date:     2014-07-30 16:02:08 +0000 (Wed, 30 Jul 2014)
Log Message:
-----------
Remove unused

Modified Paths:
--------------
    trunk/lib/EditToolbar.php

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2014-07-30 15:50:02 UTC (rev 9032)
+++ trunk/lib/EditToolbar.php	2014-07-30 16:02:08 UTC (rev 9033)
@@ -279,7 +279,7 @@
 
         // Button to add images, display in extra window as popup and insert
         if (TOOLBAR_IMAGE_PULLDOWN)
-            $sr_html = HTML($sr_html, $this->imagePulldown(TOOLBAR_IMAGE_PULLDOWN));
+            $sr_html = HTML($sr_html, $this->imagePulldown());
 
         // don't use document.write for replace, otherwise self.opener is not defined.
         $toolbar_end = "document.writeln(\"</div>\");";
@@ -411,9 +411,9 @@
     }
 
     // result is cached. Esp. the args are expensive
-    private function imagePulldown($query, $case_exact = false, $regex = 'auto')
+    private function imagePulldown()
     {
-        global $WikiTheme;
+        global $WikiTheme, $request;
 
         $image_dir = getUploadFilePath();
         $pd = new fileSet($image_dir, '*');
@@ -458,7 +458,6 @@
         require_once 'lib/TextSearchQuery.php';
         $dbi =& $request->_dbi;
         $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
-        $count = 0;
         if ($page_iter->count()) {
             global $WikiTheme;
             $pages_js = '';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.