From 47663a4ad3d2737710f2caf33abade40fdc502c1 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 27 Oct 2014 20:59:52 +0100
Subject: [ticket/13231] Update the dependencies of the migration
 contact_admin_form

PHPBB3-13231
---
 phpBB/phpbb/db/migration/data/v310/contact_admin_form.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/phpbb')

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(
-- 
cgit v1.2.1


From 4e4c3de10316fa5928b309972b49416fba77f5a9 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 27 Oct 2014 16:49:30 -0700
Subject: [ticket/13227] Properly handle curlwrapper headers in remote avatars

Read a bit of the file to ensure header values are populated and then
handle headers in the nested array structure too.

PHPBB3-13227
---
 phpBB/phpbb/avatar/driver/remote.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb')

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')
-- 
cgit v1.2.1