Search for the '@' symbol in the DSN from the right instead of the left.

That will allow the password element to include a '@' symbol without
confusing the DSN parser.

Submitted by: Alex L <admin@networkessence.net>

diff --git a/pear/DB.php b/pear/DB.php
index 1710f3997fe5a1e8ef77b436ca3de81f8177769e..e0e4789bf994b475369a5120ac2b01e1c6493521 100644 (file)
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -459,7 +459,7 @@ class DB
 
         // Get (if found): username and password
         // $dsn => username:password@protocol+hostspec/database
-        if (($at = strpos($dsn,'@')) !== false) {
+        if (($at = strrpos($dsn,'@')) !== false) {
             $str = substr($dsn, 0, $at);
             $dsn = substr($dsn, $at + 1);
             if (($pos = strpos($str, ':')) !== false) {
@@ -722,4 +722,4 @@ class DB_row
     }
 }
 
-?>
\ No newline at end of file
+?>