From: uw
Date: Wed Jan 10 01:22:55 2001
Modified files:
php-lib/php/form/form_element_calendar.inc
php-lib/php/form/form_element_combo.inc
php-lib/php/form/form_element_date.inc
php-lib/php/form/form_element_fileupload.inc
php-lib/php/form/form_element_textedit.inc
Log message:
get() now returns an empty string if the given subelement name is unknown.
Index: php-lib/php/form/form_element_calendar.inc
diff -u php-lib/php/form/form_element_calendar.inc:1.3
php-lib/php/form/form_element_calendar.inc:1.4
--- php-lib/php/form/form_element_calendar.inc:1.3 Mon Jan 8 01:59:44 2001
+++ php-lib/php/form/form_element_calendar.inc Wed Jan 10 01:22:51 2001
@@ -6,7 +6,7 @@
* Maybe someone would like to add new features to it.
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element_calendar.inc,v 1.3 2001/01/08 00:59:44 uw Exp $
+* @version $Id: form_element_calendar.inc,v 1.4 2001/01/10 00:22:51 uw Exp $
* @package Form
*/
class form_element_calendar extends form_element {
@@ -188,9 +188,8 @@
$html["prev"] = ($this->prev) ? $this->generateButton("prev",
$this->prev, "pn", -1) : "";
$html["next"] = ($this->prev) ? $this->generateButton("next",
$this->next, "pn", 1) : "";
- $subelement = strtolower($subelement);
- if ($subelement && isset($html[$subelement]))
- return $html[$subelement];
+ if ($subelement)
+ return (isset($html[$subelement])) ? $html[$subelement] : "";
return join("", $html);
} // end func get
Index: php-lib/php/form/form_element_combo.inc
diff -u php-lib/php/form/form_element_combo.inc:1.10
php-lib/php/form/form_element_combo.inc:1.11
--- php-lib/php/form/form_element_combo.inc:1.10 Mon Jan 8 01:59:44 2001
+++ php-lib/php/form/form_element_combo.inc Wed Jan 10 01:22:52 2001
@@ -4,7 +4,7 @@
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
* @package Form
-* @version $Id: form_element_combo.inc,v 1.10 2001/01/08 00:59:44 uw Exp $
+* @version $Id: form_element_combo.inc,v 1.11 2001/01/10 00:22:52 uw Exp $
*/
class form_element_combo extends form_element_selectobject {
@@ -351,8 +351,8 @@
$this->name
);
- if ($subelement && isset($html[$subelement]))
- return $html[$subelement];
+ if ($subelement)
+ return (isset($html[$subelement])) ? $html[$subelement] : "";
return join("", $html) . $this->CR_HTML;
} // end func get
Index: php-lib/php/form/form_element_date.inc
diff -u php-lib/php/form/form_element_date.inc:1.9
php-lib/php/form/form_element_date.inc:1.10
--- php-lib/php/form/form_element_date.inc:1.9 Mon Jan 8 01:59:45 2001
+++ php-lib/php/form/form_element_date.inc Wed Jan 10 01:22:52 2001
@@ -5,7 +5,7 @@
* Use this meta element to make sure that the user enters a valid date.
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element_date.inc,v 1.9 2001/01/08 00:59:45 uw Exp $
+* @version $Id: form_element_date.inc,v 1.10 2001/01/10 00:22:52 uw Exp $
* @package Form
*/
class form_element_date extends form_element {
@@ -329,8 +329,8 @@
if ($this->now)
$html["now"] = $this->generateButton();
- if ($subelement && isset($html[$subelement]))
- return $html[$subelement];
+ if ($subelement)
+ return (isset($html[$subelement])) ? $html[$subelement] : "";
return join("", $html);
} // end func get
Index: php-lib/php/form/form_element_fileupload.inc
diff -u php-lib/php/form/form_element_fileupload.inc:1.8
php-lib/php/form/form_element_fileupload.inc:1.9
--- php-lib/php/form/form_element_fileupload.inc:1.8 Sat Jan 6 02:02:58 2001
+++ php-lib/php/form/form_element_fileupload.inc Wed Jan 10 01:22:53 2001
@@ -7,7 +7,7 @@
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
* @package Form
-* @version $Id: form_element_fileupload.inc,v 1.8 2001/01/06 01:02:58 uw Exp $
+* @version $Id: form_element_fileupload.inc,v 1.9 2001/01/10 00:22:53 uw Exp $
* @access public
*/
class form_element_fileupload extends form_element_file {
@@ -54,8 +54,8 @@
$html["input"] = $this->getInputFileTag();
- if ($subelement && isset($html[$subelement]))
- return $html[$subelement];
+ if ($subelement)
+ return (isset($html[$subelement])) ? $html[$subelement] : "";
return join("", $html);
} // end func get
Index: php-lib/php/form/form_element_textedit.inc
diff -u php-lib/php/form/form_element_textedit.inc:1.1
php-lib/php/form/form_element_textedit.inc:1.2
--- php-lib/php/form/form_element_textedit.inc:1.1 Mon Jan 8 17:53:31 2001
+++ php-lib/php/form/form_element_textedit.inc Wed Jan 10 01:22:53 2001
@@ -6,7 +6,7 @@
*
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element_textedit.inc,v 1.1 2001/01/08 16:53:31 uw Exp $
+* @version $Id: form_element_textedit.inc,v 1.2 2001/01/10 00:22:53 uw Exp $
* @access public
* @package Form
*/
@@ -277,8 +277,8 @@
);
- if ($subelement && isset($html[$subelement]))
- return $html[$subelement];
+ if ($subelement)
+ return (isset($html[$subelement])) ? $html[$subelement] : "";
return join("", $html);
} // end func get
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
