3 files changed, 30 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index c21c9f4e9d..2ff479d824 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -88,6 +88,11 @@ class acp_extensions
 			break;
 
 			case 'enable_pre':
+				if (!$md_manager->validate_dir())
+				{
+					trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
 				if (!$md_manager->validate_enable())
 				{
 					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -108,6 +113,11 @@ class acp_extensions
 			break;
 
 			case 'enable':
+				if (!$md_manager->validate_dir())
+				{
+					trigger_error($user->lang['EXTENSION_DIR_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
 				if (!$md_manager->validate_enable())
 				{
 					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 21ac3666e1..e663ac90c5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1479,6 +1479,8 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
 	}
 
 	$methods = compress::methods();
+	// Sort by preferred type.
+	$methods = array_intersect(array('.zip', '.tar.bz2', '.tar.gz', '.tar'), $methods);
 	$links = array();
 
 	foreach ($methods as $method)
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 1bcef7f1f2..172f4403ac 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1473,7 +1473,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 */
 function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
 {
-	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container;
+	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2305,6 +2305,23 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	$url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx";
 	$url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor;
 
+	/**
+	* This event is used for performing actions directly after a post or topic
+	* has been submitted. When a new topic is posted, the topic ID is
+	* available in the $data array.
+	*
+	* The only action that can be done by altering data made available to this
+	* event is to modify the return URL ($url).
+	*
+	* @event core.submit_post_end
+	* @var	string		url						The "Return to topic" URL
+	* @var	array		data					Array of post data about the
+	*											submitted post
+	* @since 3.1-A3
+	*/
+	$vars = array('url', 'data');
+	extract($phpbb_dispatcher->trigger_event('core.submit_post_end', compact($vars)));
+
 	return $url;
 }