From ca1be2bf25eab8b601e763faf8d3de9eada68e60 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 18 Jun 2009 10:44:38 +0000 Subject: [PATCH] Fix bug #39875 - Empty error message in UCP folder management when creating folder without name Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9612 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/ucp/ucp_pm_options.php | 4 ++++ phpBB/language/en/ucp.php | 1 + 3 files changed, 6 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 76d8a909ef..8a7114d1a7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -116,6 +116,7 @@
  • [Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)
  • [Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)
  • [Fix] Display and highlight already used rank images while assigning new rank (Bug #22665 - Patch by nickvergessen)
    • +
  • [Fix] Empty error message in UCP folder management when creating folder without name (Bug #39875 - Patch by nickvergessen)
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
  • [Change] Template engine now permits to a limited extent variable includes.
    • diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 2d2ff23cab..e80c0672cf 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -109,6 +109,10 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit $db->sql_query($sql); $msg = $user->lang['FOLDER_ADDED']; } + else + { + $msg = $user->lang['FOLDER_NAME_EMPTY']; + } } else { diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 3cb4785301..282accdd03 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -197,6 +197,7 @@ $lang = array_merge($lang, array( 'FOES_UPDATED' => 'Your foes list has been updated successfully.', 'FOLDER_ADDED' => 'Folder successfully added.', 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored', + 'FOLDER_NAME_EMPTY' => 'You must enter a name for this folder.', 'FOLDER_NAME_EXIST' => 'Folder %s already exists.', 'FOLDER_OPTIONS' => 'Folder options', 'FOLDER_RENAMED' => 'Folder successfully renamed.',