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

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

Revision: 10433
          http://sourceforge.net/p/phpwiki/code/10433
Author:   vargenau
Date:     2021-08-04 16:16:58 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: check default_value is an array; use parent

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

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 14:31:19 UTC (rev 10432)
+++ trunk/configurator.php	2021-08-04 16:16:58 UTC (rev 10433)
@@ -1669,7 +1669,6 @@
         return "";
     }
 
-    // function get_html() { return false; }
     function get_html()
     {
         return $this->get_config_item_header() .
@@ -1890,12 +1889,12 @@
 
     function _get_config_line($posted_value)
     {
-        return _define::_get_config_line($posted_value);
+        return parent::_get_config_line($posted_value);
     }
 
     function get_html()
     {
-        return _variable_selection::get_html();
+        return parent::get_html();
     }
 }
 
@@ -1959,7 +1958,7 @@
 
     function get_html()
     {
-        return _variable_password::get_html();
+        return parent::get_html();
     }
 }
 
@@ -2087,11 +2086,14 @@
 
     function get_html()
     {
-        if (is_array($this->default_value))
+        if (is_array($this->default_value)) {
             $list_values = join("\n", $this->default_value);
-        else
+            $count = count($this->default_value);
+        } else {
             $list_values = $this->default_value;
-        $rows = max(3, count($this->default_value) + 1);
+            $count = 1;
+        }
+        $rows = max(3, $count + 1);
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"" . $rows . "\" name=\"" . $this->get_config_item_name() . "\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";

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