Pull request tweaks to category deletion checks

Fixes #20198
mantisbt · Mar 20, 2016 · 39baba2 · 39baba2
1 parent f2d6a66
commit 39baba2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/category_api.php b/core/category_api.php
@@ -592,8 +592,9 @@ function category_can_delete( $p_category_id ) {
  */
 function category_ensure_can_delete( $p_category_id ) {
 	if( !category_can_delete( $p_category_id ) ) {
-		$category_name = category_get_name( $p_category_id );
-		error_parameters( $category_name );
+		$t_category_name = category_get_name( $p_category_id );
+		error_parameters( $t_category_name );
 		trigger_error( ERROR_CATEGORY_CANNOT_DELETE_HAS_ISSUES, ERROR );
 	}
-}
+}
+
diff --git a/lang/strings_english.txt b/lang/strings_english.txt
@@ -872,7 +872,7 @@ $s_category_deleted_msg = 'Category has been successfully deleted...';
 
 # manage_proj_category_delete_page.php
 $s_category_delete_sure_msg = 'Are you sure you want to delete this category?<br />Category "%1$s" contains %2$d issues.';
-$s_category_delete_confirm_msg = 'Are you sure you want to delete this category?<br />Category "%1$s" ';
+$s_category_delete_confirm_msg = 'Are you sure you want to delete "%1$s" category?';
 $s_delete_category_button = 'Delete Category';
 
 # manage_proj_category_edit_page.php