Fixing ordering of parameters for array_merge.

mybb · Jun 29, 2014 · 34213ca · 34213ca
1 parent 1eec220
commit 34213ca
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 35 deletions.
diff --git a/admin/inc/functions_view_manager.php b/admin/inc/functions_view_manager.php
@@ -117,7 +117,7 @@ function view_manager($base_url, $type, $fields, $sort_options=array(), $conditi
 		}
 		else
 		{
-			$mybb->input = array_merge(array('perpage' => 20, $mybb->input));
+			$mybb->input = array_merge($mybb->input, array('perpage' => 20));
 		}
 
 		// Write in our JS based field selector

diff --git a/admin/modules/config/calendars.php b/admin/modules/config/calendars.php
@@ -76,12 +76,13 @@
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			"allowhtml" => 0,
-			"eventlimit" => 4,
-			"disporder" => 1,
-			"moderation" => 0
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"allowhtml" => 0,
+				"eventlimit" => 4,
+				"disporder" => 1,
+				"moderation" => 0
+			)
+		);
 	}
 
 	$page->add_breadcrumb_item($lang->add_calendar);

diff --git a/admin/modules/config/warning.php b/admin/modules/config/warning.php
@@ -281,9 +281,10 @@ function checkAction(id)
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			"percentage" => $level['percentage'],
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"percentage" => $level['percentage'],
+			)
+		);
 		$action = unserialize($level['action']);
 		if($action['type'] == 1)
 		{
@@ -469,11 +470,12 @@ function checkAction(id)
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			"points" => "2",
-			"expire_time" => 1,
-			"expire_period" => "days"
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"points" => "2",
+				"expire_time" => 1,
+				"expire_period" => "days"
+			)
+		);
 	}
 
 	$page->add_breadcrumb_item($lang->add_warning_type);
@@ -557,12 +559,13 @@ function checkAction(id)
 	else
 	{
 		$expiration = fetch_friendly_expiration($type['expirationtime']);
-		$mybb->input = array_merge(array(
-			"title" => $type['title'],
-			"points" => $type['points'],
-			"expire_time" => $expiration['time'],
-			"expire_period" => $expiration['period']
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"title" => $type['title'],
+				"points" => $type['points'],
+				"expire_time" => $expiration['time'],
+				"expire_period" => $expiration['period']
+			)
+		);
 	}
 
 	$page->add_breadcrumb_item($lang->edit_warning_type);

diff --git a/admin/modules/user/groups.php b/admin/modules/user/groups.php
@@ -453,11 +453,12 @@
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			"canmanagemembers" => 1,
-			"canmanagerequests" => 1,
-			"caninvitemembers" => 1
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"canmanagemembers" => 1,
+				"canmanagerequests" => 1,
+				"caninvitemembers" => 1
+			)
+		);
 	}
 
 	$form_container = new FormContainer($lang->add_group_leader." {$group['title']}");
@@ -694,9 +695,10 @@
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			"namestyle" => "{username}"
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				"namestyle" => "{username}"
+			)
+		);
 	}
 
 	$form_container = new FormContainer($lang->add_user_group);

diff --git a/admin/modules/user/titles.php b/admin/modules/user/titles.php
@@ -78,10 +78,11 @@
 	}
 	else
 	{
-		$mybb->input = array_merge(array(
-			'stars' => '1',
-			'starimage' => '{theme}/star.png',
-		), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array(
+				'stars' => '1',
+				'starimage' => '{theme}/star.png',
+			)
+		);
 	}
 
 	$page->add_breadcrumb_item($lang->add_new_user_title);

diff --git a/admin/modules/user/users.php b/admin/modules/user/users.php
@@ -385,7 +385,7 @@
 	}
 	else
 	{
-		$mybb->input = array_merge(array('usergroup' => 2), $mybb->input);
+		$mybb->input = array_merge($mybb->input, array('usergroup' => 2));
 	}
 
 	$form_container = new FormContainer($lang->required_profile_info);
@@ -1300,7 +1300,7 @@
 	);
 	$form_container->output_row($lang->thread_view_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $thread_options)."</div>");
 
-	$languages = array_merge(array('' => $lang->use_default), $lang->get_languages());
+	$languages = array_merge($lang->get_languages(), array('' => $lang->use_default));
 
 	$other_options = array(
 		$form->generate_check_box("showredirect", 1, $lang->show_redirect, array("checked" => $mybb->input['showredirect'])),