[phpwiki-checkins] SF.net SVN: phpwiki:[8040] trunk/lib/plugin/WikiAdminRename.php

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

Revision: 8040
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8040&view=rev
Author:   vargenau
Date:     2011-04-13 11:26:19 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Avoid warnings

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2011-04-13 09:58:48 UTC (rev 8039)
+++ trunk/lib/plugin/WikiAdminRename.php	2011-04-13 11:26:19 UTC (rev 8040)
@@ -53,12 +53,13 @@
     }
 
     function renameHelper($name, $from, $to, $options = false) {
-            if ($options['regex'])
-                return preg_replace('/'.$from.'/'.($options['icase']?'i':''), $to, $name);
-            elseif ($options['icase'])
-                return str_ireplace($from, $to, $name);
-            else
+        if (isset($options['regex'])) {
+            return preg_replace('/'.$from.'/'.(isset($options['icase'])?'i':''), $to, $name);
+        } elseif (isset($options['icase'])) {
+            return str_ireplace($from, $to, $name);
+        } else {
             return str_replace($from, $to, $name);
+        }
     }
 
     function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false,
@@ -299,9 +300,9 @@
     function _getValue ($page_handle, &$revision_handle) {
         global $request;
         $post_args = $request->getArg('admin_rename');
-        $options = array('regex' => @$post_args['regex'],
-                         'icase' => @$post_args['icase']);
-
+        $options =
+          array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
+                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
         $value = $post_args
             ? WikiPlugin_WikiAdminRename::renameHelper
                 ($page_handle->getName(),


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