Update fix.

BoardTools · Nov 3, 2014 · f80fdaf · f80fdaf
1 parent c2480b5
commit f80fdaf
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/acp/upload_module.php b/acp/upload_module.php
@@ -15,6 +15,7 @@ class upload_module
 	public $main_link;
 	public $back_link;
 	private $self_update;
+	private $upload_ext_name;
 	var $zip_dir = '';
 	var $error = '';
 	function main($id, $mode)
@@ -44,8 +45,8 @@ function main($id, $mode)
 			\filetree::get_file($file);
 		}
 
-		$ext_name = 'boardtools/upload';
-		$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $user, $phpbb_root_path);
+		$this->upload_ext_name = 'boardtools/upload';
+		$md_manager = new \phpbb\extension\metadata_manager($this->upload_ext_name, $config, $phpbb_extension_manager, $template, $user, $phpbb_root_path);
 		try
 		{
 			$this->metadata = $md_manager->get_metadata('all');
@@ -531,6 +532,13 @@ function upload_ext($action)
 				$this->trigger_error($user->lang['ACP_UPLOAD_EXT_ERROR_DEST'] . $this->back_link, E_USER_WARNING);
 				return false;
 			}
+			else if (strpos($destination, $this->upload_ext_name) !== false && $action != 'upload_self')
+			{
+				$this->rrmdir($phpbb_root_path . 'ext/' . $ext_tmp);
+				$file->remove();
+				$this->trigger_error($user->lang['EXT_UPLOAD_ERROR'] . $this->back_link, E_USER_WARNING);
+				return false;
+			}
 			$display_name = (isset($json_a['extra']['display-name'])) ? $json_a['extra']['display-name'] : 'Unknown extension';
 			if (!isset($json_a['type']) || $json_a['type'] != "phpbb-extension")
 			{