[phpwiki-checkins] SF.net SVN: phpwiki:[6378] trunk/configurator.php

[<ru...@us...>]

Revision: 6378
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6378&view=rev
Author:   rurban
Date:     2009-01-08 09:40:18 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Protect against empty join warning

Modified Paths:
--------------
    trunk/configurator.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2009-01-08 09:36:49 UTC (rev 6377)
+++ trunk/configurator.php	2009-01-08 09:40:18 UTC (rev 6378)
@@ -2139,7 +2139,8 @@
         // split the phrase by any number of commas or space characters,
         // which include " ", \r, \t, \n and \f
         $list_values = preg_split("/[\s,]+/", $posted_value, -1, PREG_SPLIT_NO_EMPTY);
-        $list_values = join("|", $list_values);
+        if ($list_values)
+            $list_values = join("|", $list_values);
         return _variable::_get_config_line($list_values);
     }
     function get_html() {
@@ -2158,13 +2159,15 @@
 extends _define {
     function _get_config_line($posted_value) {
         $list_values = preg_split("/[\s,]+/", $posted_value, -1, PREG_SPLIT_NO_EMPTY);
-        $list_values = join("|", $list_values);
+        if ($list_values)
+            $list_values = join("|", $list_values);
         return _variable::_get_config_line($list_values);
     }
     function get_html() {
         $list_values = explode("|", $this->default_value);
         $rows = max(3, count($list_values) +1);
-        $list_values = join("\n", $list_values);
+        if ($list_values)
+            $list_values = join("\n", $list_values);
         $ta = $this->get_config_item_header();
 	$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
@@ -2190,7 +2193,10 @@
             return "\n;" . $this->_config_format('');
     }
     function get_html() {
-        $list_values = join("\n", $this->default_value);
+    	if (is_array($this->default_value))
+            $list_values = join("\n", $this->default_value);
+        else    
+            $list_values = $this->default_value;
         $rows = max(3, count($this->default_value) +1);
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";


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