diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php
index 9000e18452..50def2526a 100644
--- a/phpBB/admin/admin_ranks.php
+++ b/phpBB/admin/admin_ranks.php
@@ -34,7 +34,7 @@ define('IN_PHPBB', 1);
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 04bd501c84..aac94bb3d2 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -36,23 +36,20 @@ if( !empty($setmodules) )
 	return;
 }
 
-//
-// Load default header
-//
-if( isset($HTTP_GET_VARS['export_pack']) )
-{
-	if ( $HTTP_GET_VARS['export_pack'] == "send" )
-	{	
-		$no_page_header = true;
-	}
-}
-
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
 $no_page_header = $cancel;
 
+//
+// Load default header
+//
+if ((!empty($HTTP_GET_VARS['export_pack']) && $HTTP_GET_VARS['export_pack'] == 'send') || (!empty($_GET['export_pack']) && $_GET['export_pack'] == 'send'))
+{
+	$no_page_header = true;
+}
+
 require('./pagestart.' . $phpEx);
 
 if ($cancel)
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 0317b3b535..8b3f2ec311 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -41,10 +41,10 @@ if( !empty($setmodules) )
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
+$confirm = (isset($HTTP_POST_VARS['confirm']) || isset($_POST['confirm'])) ? TRUE : FALSE;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? TRUE : FALSE;
 
-$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
+$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || !empty($_POST['send_file']) || $cancel) ? TRUE : FALSE;
 
 require('./pagestart.' . $phpEx);
 
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 2967fb14ca..2ffc06eb79 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -35,7 +35,7 @@ define('IN_PHPBB', 1);
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index db9a1349d5..fd0718f6cb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -83,6 +83,8 @@ p,ul,td {font-size:10pt;}
 <li>[Fix] Fixed the group permission system's use of array access</li>
 <li>[Fix] Simple group permissions now work properly</li>
 <li>[Sec] Fix possible XSRF Vulnerability in private messaging and groups handling</li>
+<li>[Fix] Fix inability to export smilies (Bug #2265)</li>
+<li>[Fix] Fixing some problems with PHP5 and register_long_arrays off</li>
 </ul>
 
 <a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2fa045cc4f..ab8e88954f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -370,7 +370,7 @@ function init_userprefs($userdata)
 
 		$userdata['user_lang'] = $default_lang;
 	}
-	elseif ( $userdata['user_id'] === ANONYMOUS && $board_config['default_lang'] !== $default_lang )
+	elseif ( $userdata['user_id'] == ANONYMOUS && $board_config['default_lang'] !== $default_lang )
 	{
 		$sql = 'UPDATE ' . CONFIG_TABLE . "
 			SET config_value = '" . $default_lang . "'