cvs: php4 /pear PEAR.php
| From: | Stig Bakken | Date: | Wed, 31 Oct 2001 05:48:17 +0000 |
| Subject: | cvs: php4 /pear PEAR.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-1214@lists.php.net to get a copy of this message | ||
ssb Wed Oct 31 00:48:17 2001 EDT
Modified files:
/php4/pear PEAR.php
Log:
* removed error_prepend and error_append properties
Index: php4/pear/PEAR.php
diff -u php4/pear/PEAR.php:1.25 php4/pear/PEAR.php:1.26
--- php4/pear/PEAR.php:1.25 Wed Oct 31 00:44:19 2001
+++ php4/pear/PEAR.php Wed Oct 31 00:48:16 2001
@@ -19,7 +19,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: PEAR.php,v 1.25 2001/10/31 05:44:19 ssb Exp $
+// $Id: PEAR.php,v 1.26 2001/10/31 05:48:16 ssb Exp $
//
define('PEAR_ERROR_RETURN', 1);
@@ -527,8 +527,6 @@
// {{{ properties
var $error_message_prefix = '';
- var $error_prepend = '';
- var $error_append = '';
var $mode = PEAR_ERROR_RETURN;
var $level = E_USER_NOTICE;
var $code = -1;
@@ -656,8 +654,7 @@
*/
function getMessage ()
{
- return ($this->error_prepend . $this->error_message_prefix .
- $this->message . $this->error_append);
+ return ($this->error_message_prefix . $this->message);
}
@@ -751,11 +748,9 @@
$callback = $this->callback;
}
return sprintf('[%s: message="%s" code=%d mode=callback '.
- 'callback=%s prefix="%s" prepend="%s"
append="%s" '.
- 'info="%s"]',
+ 'callback=%s prefix="%s" info="%s"]',
get_class($this), $this->message, $this->code,
$callback, $this->error_message_prefix,
- $this->error_prepend, $this->error_append,
$this->userinfo);
}
if ($this->mode & PEAR_ERROR_CALLBACK) {
@@ -773,12 +768,11 @@
if ($this->mode & PEAR_ERROR_RETURN) {
$modes[] = 'return';
}
- return sprintf('[%s: message="%s" code=%d mode=%s level=%s
prefix="%s" '.
- 'prepend="%s" append="%s"
info="%s"]',
+ return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+ 'prefix="%s" info="%s"]',
get_class($this), $this->message, $this->code,
implode("|", $modes), $levels[$this->level],
$this->error_message_prefix,
- $this->error_prepend, $this->error_append,
$this->userinfo);
}