From 44f6f66bd28289b00e9f08234b92ceaa2a467416 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Tue, 7 Dec 1999 21:38:51 +0000 Subject: [PATCH] (DB::parseDSN) check for an extra / at the end purely to guard against user error --- pear/DB.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pear/DB.php b/pear/DB.php index 52c50c7919..5559767345 100644 --- a/pear/DB.php +++ b/pear/DB.php @@ -206,7 +206,7 @@ class DB { return $parsed; // XXX ADDREF } - if (preg_match('|^(.*)/([^/]+)$|', $dsn, &$arr)) { + if (preg_match('|^(.*)/([^/]+)/?$|', $dsn, &$arr)) { $parsed['database'] = $arr[2]; $dsn = $arr[1]; } @@ -226,7 +226,7 @@ class DB { } if (!$parsed['database']) - $dsn = preg_replace('|/+$|', '', $dsn); + $dsn = preg_replace('|/+$|', '', &$dsn); $parsed['hostspec'] = $dsn; -- 2.40.0