From: Stig Bakken <ssb@php.net>
Date: Mon, 28 Aug 2000 23:09:36 +0000 (+0000)
Subject: * renamed toString method to __string_value
X-Git-Tag: php-4.0.2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54e911aa4f4c9cd7528d8343340cbd7f879a3484;p=php

* renamed toString method to __string_value
---

diff --git a/pear/DB.php b/pear/DB.php
index b111aaa801..d4fd20af6a 100644
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -369,7 +369,7 @@ class DB {
 		if (!$parsed['database'])
 			$dsn = preg_replace('|/+$|', '', $dsn);
 
-		$parsed['hostspec'] = $dsn;
+		$parsed['hostspec'] = urldecode($dsn);
 
 		if (!$parsed['dbsyntax']) {
 			$parsed['dbsyntax'] = $parsed['phptype'];
diff --git a/pear/PEAR.php.in b/pear/PEAR.php.in
index 3575330926..3935b91aa4 100644
--- a/pear/PEAR.php.in
+++ b/pear/PEAR.php.in
@@ -233,14 +233,14 @@ class PEAR_Error
 	}
 
     // }}}
-    // {{{ toString()
+    // {{{ __string_value()
 
 	/**
 	 * Make a string representation of this object.
 	 *
 	 * @return string a string with an object "summary"
 	 */
-	function toString() {
+	function __string_value() {
 		$modes = array(PEAR_ERROR_RETURN => "return",
 					   PEAR_ERROR_PRINT => "print",
 					   PEAR_ERROR_TRIGGER => "trigger",
@@ -248,9 +248,11 @@ class PEAR_Error
 		$levels = array(E_USER_NOTICE => "notice",
 						E_USER_WARNING => "warning",
 						E_USER_ERROR => "error");
-		return sprintf("[%s: message=%s code=%d mode=%s level=%s prefix=%s prepend=%s append=%s]",
-					   $this->message, $this->code, $modes[$this->mode], $levels[$this->level],
-					   $this->error_message_prefix, $this->error_prepend, $this->error_append);
+		return sprintf("[%s: message=\"%s\" code=%d mode=%s level=%s prefix=\"%s\" prepend=\"%s\" append=\"%s\"]",
+					   get_class($this), $this->message, $this->code,
+					   $modes[$this->mode], $levels[$this->level],
+					   $this->error_message_prefix, $this->error_prepend,
+					   $this->error_append);
 	}
 
     // }}}