diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
| commit | 794c5749696c9fa2595ed3a1d7c836a0d984e11c (patch) | |
| tree | 37aab2f0f965ddcaeb1d26af753095f59a6e025c /phpBB/includes/functions_transfer.php | |
| parent | 7aced345c5a2871f6eddfe316297b4ff9a0ebb76 (diff) | |
| download | forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.gz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.bz2 forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.xz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.zip | |
remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_transfer.php')
| -rw-r--r-- | phpBB/includes/functions_transfer.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php index 63f8d72e9f..808f28a147 100644 --- a/phpBB/includes/functions_transfer.php +++ b/phpBB/includes/functions_transfer.php @@ -255,7 +255,7 @@ class ftp extends transfer $this->password = $password; $this->timeout = $timeout; - // Make sure $this->root_path is layed out the same way as the $user->page['root_script_path'] value (/ at the end) + // Make sure $this->root_path is layed out the same way as the phpbb::$user->page['root_script_path'] value (/ at the end) $this->root_path = str_replace('\\', '/', $this->root_path); if (!empty($root_path)) @@ -274,13 +274,11 @@ class ftp extends transfer */ private function data() { - global $user; - return array( 'host' => 'localhost', 'username' => 'anonymous', 'password' => '', - 'root_path' => $user->page['root_script_path'], + 'root_path' => phpbb::$user->page['root_script_path'], 'port' => 21, 'timeout' => 10 ); @@ -478,7 +476,7 @@ class ftp_fsock extends transfer $this->password = $password; $this->timeout = $timeout; - // Make sure $this->root_path is layed out the same way as the $user->page['root_script_path'] value (/ at the end) + // Make sure $this->root_path is layed out the same way as the phpbb::$user->page['root_script_path'] value (/ at the end) $this->root_path = str_replace('\\', '/', $this->root_path); if (!empty($root_path)) @@ -497,13 +495,11 @@ class ftp_fsock extends transfer */ private function data() { - global $user; - return array( 'host' => 'localhost', 'username' => 'anonymous', 'password' => '', - 'root_path' => $user->page['root_script_path'], + 'root_path' => phpbb::$user->page['root_script_path'], 'port' => 21, 'timeout' => 10 ); |