Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php

2 files changed, 49 insertions, 49 deletions

diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 8c014aebed..f6b447dc90 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -36,6 +36,26 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$this->add_lang(array('ucp', 'acp/groups'));
 	}
 
+	// Enable all avatars in the ACP
+	protected function enable_all_avatars()
+	{
+		$this->add_lang('acp/board');
+
+		$crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid);
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
 	public function groups_manage_test_data()
 	{
 		return array(
@@ -60,4 +80,33 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$crawler = self::submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
 	}
+
+	public function group_avatar_min_max_data()
+	{
+		return array(
+			array('uploadurl', 'foo', 'TOO_SHORT'),
+			array('uploadurl', 'foobar', 'AVATAR_URL_INVALID'),
+			array('uploadurl', str_repeat('f', 256), 'TOO_LONG'),
+			array('remotelink', 'foo', 'TOO_SHORT'),
+			array('remotelink', 'foobar', 'AVATAR_URL_INVALID'),
+			array('remotelink', str_repeat('f', 256), 'TOO_LONG'),
+		);
+	}
+
+	/**
+	* @dataProvider group_avatar_min_max_data
+	*/
+	public function test_group_avatar_min_max($form_name, $input, $expected)
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('ucp', 'acp/groups'));
+		$this->enable_all_avatars();
+
+		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form[$form_name]->setValue($input);
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang($expected), $crawler->text());
+	}
 }
diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index 1f9749ec15..f48c793ea1 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php
@@ -50,53 +50,4 @@ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_te
 		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
 		$this->assertEquals($teampage_settings, $this->get_teampage_settings());
 	}
-
-	// Enable all avatars in the ACP
-	private function enable_all_avatars()
-	{
-		$this->add_lang('acp/board');
-
-		$crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
-	}
-
-	public function group_avatar_min_max_data()
-	{
-		return array(
-			array('uploadurl', 'foo', 'TOO_SHORT'),
-			array('uploadurl', 'foobar', 'AVATAR_URL_INVALID'),
-			array('uploadurl', str_repeat('f', 256), 'TOO_LONG'),
-			array('remotelink', 'foo', 'TOO_SHORT'),
-			array('remotelink', 'foobar', 'AVATAR_URL_INVALID'),
-			array('remotelink', str_repeat('f', 256), 'TOO_LONG'),
-		);
-	}
-
-	/**
-	* @dataProvider group_avatar_min_max_data
-	*/
-	public function test_group_avatar_min_max($form_name, $input, $expected)
-	{
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('ucp', 'acp/groups'));
-		$this->enable_all_avatars();
-
-		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form[$form_name]->setValue($input);
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang($expected), $crawler->text());
-	}
 }