From b364db488faea97eb6d7f5d4eba5b268394a75e7 Mon Sep 17 00:00:00 2001
From: fujimoto <fujimoto@2ef88817-412d-0410-a32c-8029a115e976>
Date: Mon, 6 Dec 2004 01:25:29 +0000
Subject: [PATCH] - fix typo

---
 Ethna.php                  |  9 +++++++++
 class/Ethna_ActionForm.php | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Ethna.php b/Ethna.php
index c4a093d..60500d1 100644
--- a/Ethna.php
+++ b/Ethna.php
@@ -289,6 +289,9 @@ class Ethna extends PEAR
 	{
 		if (func_num_args() > 2) {
 			$userinfo = array_slice(func_get_args(), 2);
+			if (count($userinfo) == 1 && is_array($userinfo[0])) {
+				$userinfo = $userinfo[0];
+			}
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_ERROR, $userinfo);
 		} else {
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_ERROR);
@@ -309,6 +312,9 @@ class Ethna extends PEAR
 	{
 		if (func_num_args() > 2) {
 			$userinfo = array_slice(func_get_args(), 2);
+			if (count($userinfo) == 1 && is_array($userinfo[0])) {
+				$userinfo = $userinfo[0];
+			}
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_WARNING, $userinfo);
 		} else {
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_WARNING);
@@ -329,6 +335,9 @@ class Ethna extends PEAR
 	{
 		if (func_num_args() > 2) {
 			$userinfo = array_slice(func_get_args(), 2);
+			if (count($userinfo) == 1 && is_array($userinfo[0])) {
+				$userinfo = $userinfo[0];
+			}
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_NOTICE, $userinfo);
 		} else {
 			$error =& new Ethna_Error($message, $code, PEAR_ERROR_RETURN, E_USER_NOTICE);
diff --git a/class/Ethna_ActionForm.php b/class/Ethna_ActionForm.php
index 86ec9c2..d8ab793 100644
--- a/class/Ethna_ActionForm.php
+++ b/class/Ethna_ActionForm.php
@@ -616,34 +616,34 @@ class Ethna_ActionForm
 		} else if ($code == E_FORM_WRONGTYPE_BOOLEAN) {
 			$message = "{form}¤Ë¤Ï1¤Þ¤¿¤Ï0¤Î¤ßÆþÎϤǤ­¤Þ¤¹";
 		} else if ($code == E_FORM_MIN_INT) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%d°Ê¾å¤Î¿ô»ú(À°¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['min']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%d°Ê¾å¤Î¿ô»ú(À°¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['min']);
 			return;
 		} else if ($code == E_FORM_MIN_FLOAT) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%f°Ê¾å¤Î¿ô»ú(¾®¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['min']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%f°Ê¾å¤Î¿ô»ú(¾®¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['min']);
 			return;
 		} else if ($code == E_FORM_MIN_DATETIME) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%s°Ê¹ß¤ÎÆüÉÕ¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['min']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%s°Ê¹ß¤ÎÆüÉÕ¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['min']);
 			return;
 		} else if ($code == E_FORM_MIN_FILE) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%dKB°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ²¼¤µ¤¤", $code, $def['min']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%dKB°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ²¼¤µ¤¤", $code, $value['min']);
 			return;
 		} else if ($code == E_FORM_MIN_STRING) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%dʸ»ú°Ê¾åÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['min']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%dʸ»ú°Ê¾åÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['min']);
 			return;
 		} else if ($code == E_FORM_MAX_INT) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%d°Ê²¼¤Î¿ô»ú(À°¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['max']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%d°Ê²¼¤Î¿ô»ú(À°¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['max']);
 			return;
 		} else if ($code == E_FORM_MAX_FLOAT) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%f°Ê²¼¤Î¿ô»ú(¾®¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['max']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%f°Ê²¼¤Î¿ô»ú(¾®¿ô)¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['max']);
 			return;
 		} else if ($code == E_FORM_MAX_DATETIME) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%s°ÊÁ°¤ÎÆüÉÕ¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['max']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%s°ÊÁ°¤ÎÆüÉÕ¤òÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['max']);
 			return;
 		} else if ($code == E_FORM_MAX_FILE) {
-			$this->ae->add($name, "{form}¤Ë¤Ï%dKB°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ²¼¤µ¤¤", $code, $def['max']);
+			$this->ae->add($name, "{form}¤Ë¤Ï%dKB°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ²¼¤µ¤¤", $code, $value['max']);
 			return;
 		} else if ($code == E_FORM_MAX_STRING) {
-			$this->ae->add($name, "{form}¤Ï%dʸ»ú°Ê²¼¤ÇÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $def['max']);
+			$this->ae->add($name, "{form}¤Ï%dʸ»ú°Ê²¼¤ÇÆþÎϤ·¤Æ²¼¤µ¤¤", $code, $value['max']);
 			return;
 		} else if ($code == E_FORM_REGEXP) {
 			$message = "{form}¤òÀµ¤·¤¯ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤";
-- 
2.11.0