cvs: pear /HTML_QuickForm/QuickForm file.php
| From: | Alexey Borzov | Date: | Wed, 25 Jun 2003 13:46:01 +0000 |
| Subject: | cvs: pear /HTML_QuickForm/QuickForm file.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-11166@lists.php.net to get a copy of this message | ||
avb Wed Jun 25 09:46:01 2003 EDT
Modified files:
/pear/HTML_QuickForm/QuickForm file.php
Log:
Fix: call _ruleIsUploadedFile() statically from other rules
Index: pear/HTML_QuickForm/QuickForm/file.php
diff -u pear/HTML_QuickForm/QuickForm/file.php:1.13 pear/HTML_QuickForm/QuickForm/file.php:1.14
--- pear/HTML_QuickForm/QuickForm/file.php:1.13 Mon Jun 16 16:34:41 2003
+++ pear/HTML_QuickForm/QuickForm/file.php Wed Jun 25 09:46:01 2003
@@ -17,7 +17,7 @@
// | Bertrand Mansion <bmansion@mamasam.com> |
// +----------------------------------------------------------------------+
//
-// $Id: file.php,v 1.13 2003/06/16 20:34:41 avb Exp $
+// $Id: file.php,v 1.14 2003/06/25 13:46:01 avb Exp $
require_once("HTML/QuickForm/input.php");
@@ -253,7 +253,7 @@
*/
function _ruleCheckMaxFileSize($elementValue, $maxSize)
{
- if (!$this->_ruleIsUploadedFile($elementValue)) {
+ if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
return true;
}
return ($maxSize >= @filesize($elementValue['tmp_name']));
@@ -272,7 +272,7 @@
*/
function _ruleCheckMimeType($elementValue, $mimeType)
{
- if (!$this->_ruleIsUploadedFile($elementValue)) {
+ if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
return true;
}
if (is_array($mimeType)) {
@@ -294,7 +294,7 @@
*/
function _ruleCheckFileName($elementValue, $regex)
{
- if (!$this->_ruleIsUploadedFile($elementValue)) {
+ if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
return true;
}
return preg_match($regex, $elementValue['name']);