phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[8050] trunk/lib/plugin/WikiFormRich.php

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

Revision: 8050
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8050&view=rev
Author:   vargenau
Date:     2011-04-14 09:02:55 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
Do not break HTML dump

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

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2011-04-13 16:04:19 UTC (rev 8049)
+++ trunk/lib/plugin/WikiFormRich.php	2011-04-14 09:02:55 UTC (rev 8050)
@@ -172,6 +172,10 @@
         if (empty($action)) {
             return $this->error(fmt("A required argument '%s' is missing.", "action"));
         }
+        if ($action != 'browse') {
+            return $this->disabled("(action != 'browse')");
+        }
+
         $form = HTML::form(array('action' => $request->getPostURL(),
                                  'method' => strtolower($method),
                                  'class'  => 'wikiformrich',


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8059] trunk/lib/plugin/WikiFormRich.php

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

Revision: 8059
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8059&view=rev
Author:   vargenau
Date:     2011-04-27 10:10:37 +0000 (Wed, 27 Apr 2011)

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

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

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2011-04-27 10:04:46 UTC (rev 8058)
+++ trunk/lib/plugin/WikiFormRich.php	2011-04-27 10:10:37 UTC (rev 8059)
@@ -172,9 +172,6 @@
         if (empty($action)) {
             return $this->error(fmt("A required argument '%s' is missing.", "action"));
         }
-        if ($action != 'browse') {
-            return $this->disabled(_("Plugin not run: not in browse mode"));
-        }
 
         $form = HTML::form(array('action' => $request->getPostURL(),
                                  'method' => strtolower($method),
@@ -245,7 +242,7 @@
               case 'combobox': // text left
                   $input['autocomplete'] = 1;
               case 'pulldown':
-                  $values = @$input['value'];
+                  $values = isset($input['value']) ? $input['value'] : '';
                   unset($input['value']);
                   unset($input['type']);
                   if (is_string($values)) $values = explode(",", $values);
@@ -325,7 +322,7 @@
         // only match begin: autocomplete_matchbegin, or
         $input['autocomplete_matchsubstring'] = "true";
         if (empty($values)) {
-            if ($input['method']) {
+            if (isset($input['method']) && $input['method']) {
                 if (empty($input['args'])) {
                     if (preg_match("/^(.*?) (.*)$/",$input['method'],$m)) {
                         $input['method'] = $m[1];


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