diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 19:04:13 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 19:04:13 -0700 |
| commit | 2438bfbfc66689beb8e22b80564a2b877f6763ba (patch) | |
| tree | 3059bf14f2f2b5e2d0c3706467265767837cc91b /phpBB/phpbb | |
| parent | 66c23d685540de864177dff87d4a25b16afd9a15 (diff) | |
| parent | b9c08cddd47b39355458e828d847c34ab0e8c378 (diff) | |
| download | forums-2438bfbfc66689beb8e22b80564a2b877f6763ba.tar forums-2438bfbfc66689beb8e22b80564a2b877f6763ba.tar.gz forums-2438bfbfc66689beb8e22b80564a2b877f6763ba.tar.bz2 forums-2438bfbfc66689beb8e22b80564a2b877f6763ba.tar.xz forums-2438bfbfc66689beb8e22b80564a2b877f6763ba.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13227] Properly handle curlwrapper headers in remote avatars
[ticket/13231] Update the dependencies of the migration contact_admin_form
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/remote.php | 18 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/contact_admin_form.php | 5 |
2 files changed, 22 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 1bd7f6c927..4b0ee3f06f 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -130,8 +130,24 @@ class remote extends \phpbb\avatar\driver\driver { // Timeout after 1 second stream_set_timeout($file_stream, 1); + // read some data to ensure headers are present + fread($file_stream, 1024); $meta = stream_get_meta_data($file_stream); - foreach ($meta['wrapper_data'] as $header) + + if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers'])) + { + $headers = $meta['wrapper_data']['headers']; + } + else if (isset($meta['wrapper_data']) && is_array($meta['wrapper_data'])) + { + $headers = $meta['wrapper_data']; + } + else + { + $headers = array(); + } + + foreach ($headers as $header) { $header = preg_split('/ /', $header, 2); if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type') diff --git a/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php b/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php index c2dd09ddf6..5736369f1a 100644 --- a/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php +++ b/phpBB/phpbb/db/migration/data/v310/contact_admin_form.php @@ -20,6 +20,11 @@ class contact_admin_form extends \phpbb\db\migration\migration return isset($this->config['contact_admin_form_enable']); } + static public function depends_on() + { + return array('\phpbb\db\migration\data\v310\config_db_text'); + } + public function update_data() { return array( |