[phpwiki-checkins] SF.net SVN: phpwiki:[7051] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 7051
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7051&view=rev
Author:   vargenau
Date:     2009-07-31 20:12:11 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
No message needed if string not found

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSearchReplace.php

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2009-07-29 20:26:26 UTC (rev 7050)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2009-07-31 20:12:11 UTC (rev 7051)
@@ -101,14 +101,10 @@
         foreach ($pages as $pagename) {
             if (!mayAccessPage('edit', $pagename)) {
 		$ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
-            } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex))
-            {
+            } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
                 $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", 
                                               $from, $to, WikiLink($pagename))));
                 $count++;
-            } else {
-                $ul->pushContent(HTML::li(fmt("Search string '%s' not found in content of page '%s'.", 
-                                              $from, WikiLink($pagename))));
             }
         }
         if ($count) {
@@ -120,12 +116,11 @@
                 $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
             }
             $result->pushContent($ul);
-            return $result;
         } else {
             $result->setAttr('class', 'error');
             $result->pushContent(HTML::p("No pages changed."));
-            return $result;
         }
+        return $result;
     }
     
     function run($dbi, $argstr, &$request, $basepage) {


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