aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_transfer.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-08 15:20:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-08 15:20:57 +0000
commit1c41450bd90f86f47521952e7f48339f103b8e5d (patch)
tree3ec8b226ce76e5ba5de810e7e1325047851f3716 /phpBB/includes/functions_transfer.php
parent4519c510663b5c5168d6594d9eb96819a0c6bae0 (diff)
downloadforums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar
forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.gz
forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.bz2
forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.xz
forums-1c41450bd90f86f47521952e7f48339f103b8e5d.zip
- re-add script_path for "strange configurations" to let them force the generated urls correctly
- show rank title if no rank image present in memberlist - other fixes. git-svn-id: file:///svn/phpbb/trunk@6730 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_transfer.php')
-rw-r--r--phpBB/includes/functions_transfer.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
index 4c47f99412..8c00f2b1dd 100644
--- a/phpBB/includes/functions_transfer.php
+++ b/phpBB/includes/functions_transfer.php
@@ -359,9 +359,12 @@ class ftp extends transfer
*/
function _chdir($dir = '')
{
- if (substr($dir, -1, 1) == '/')
+ if ($dir && $dir !== '/')
{
- $dir = substr($dir, 0, -1);
+ if (substr($dir, -1, 1) == '/')
+ {
+ $dir = substr($dir, 0, -1);
+ }
}
return @ftp_chdir($this->connection, $dir);
@@ -585,9 +588,12 @@ class ftp_fsock extends transfer
*/
function _chdir($dir = '')
{
- if (substr($dir, -1, 1) == '/')
+ if ($dir && $dir !== '/')
{
- $dir = substr($dir, 0, -1);
+ if (substr($dir, -1, 1) == '/')
+ {
+ $dir = substr($dir, 0, -1);
+ }
}
return $this->_send_command('CWD', $dir);