diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 14 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 16 |
2 files changed, 23 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d403b7bd28..77c6e500e8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@ <ol> <li><a href="#changelog">Changelog</a> <ol style="list-style-type: lower-roman;"> + <li><a href="#v30rc7">Changes since RC-7</a></li> <li><a href="#v30rc6">Changes since RC-6</a></li> <li><a href="#v30rc5">Changes since RC-5</a></li> <li><a href="#v30rc4">Changes since RC-4</a></li> @@ -83,9 +84,10 @@ <ul> <li>[Fix] Fixed MSSQL related bug in the update system</li> <li>[Fix] Display "Return to" links on unwritable forums (Bug #14824)</li> + <li>[Fix] Mitigating different realpath() handling between PHP versions (fixing confirm box redirects)</li> </ul> - <a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3> + <a name="v30rc6"></a><h3>1.ii. Changes since 3.0.RC6</h3> <ul> <li>[Fix] Submitting language changes using acp_language (Bug #14736)</li> @@ -95,7 +97,7 @@ <li>[Fix] Able to request new password (Bug #14743)</li> </ul> - <a name="v30rc5"></a><h3>1.ii. Changes since 3.0.RC5</h3> + <a name="v30rc5"></a><h3>1.iii. Changes since 3.0.RC5</h3> <ul> <li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li> @@ -158,7 +160,7 @@ <li>[Sec] New password hashing mechanism for storing passwords (#i42)</li> </ul> - <a name="v30rc4"></a><h3>1.iii. Changes since 3.0.RC4</h3> + <a name="v30rc4"></a><h3>1.iv. Changes since 3.0.RC4</h3> <ul> <li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li> @@ -209,7 +211,7 @@ <li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li> </ul> - <a name="v30rc3"></a><h3>1.iv. Changes since 3.0.RC3</h3> + <a name="v30rc3"></a><h3>1.v. Changes since 3.0.RC3</h3> <ul> <li>[Fix] Fixing some subsilver2 and prosilver style issues</li> @@ -318,7 +320,7 @@ </ul> - <a name="v30rc2"></a><h3>1.v. Changes since 3.0.RC2</h3> + <a name="v30rc2"></a><h3>1.vi. Changes since 3.0.RC2</h3> <ul> <li>[Fix] Re-allow searching within the memberlist</li> @@ -364,7 +366,7 @@ </ul> - <a name="v30rc1"></a><h3>1.vi. Changes since 3.0.RC1</h3> + <a name="v30rc1"></a><h3>1.vii. Changes since 3.0.RC1</h3> <ul> <li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li> diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f55a5b4d39..80a6faceca 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -683,6 +683,12 @@ if (!function_exists('realpath')) // Put the slashes back to the native operating systems slashes $resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved); + // Check for DIRECTORY_SEPARATOR at the end (and remove it!) + if (substr($resolved, -1) == DIRECTORY_SEPARATOR) + { + return substr($resolved, 0, -1); + } + return $resolved; // We got here, in the end! } } @@ -694,7 +700,15 @@ else */ function phpbb_realpath($path) { - return realpath($path); + $path = realpath($path); + + // Check for DIRECTORY_SEPARATOR at the end (and remove it!) + if (substr($path, -1) == DIRECTORY_SEPARATOR) + { + return substr($path, 0, -1); + } + + return $path; } } |