diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-10-11 14:31:22 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-10-11 14:31:22 +0000 |
| commit | c969d4f83f3770bb26cb407c97aaa34f829e935f (patch) | |
| tree | f246ebd1b6d4ea19687a5ad3a095941547a180d8 /phpBB | |
| parent | 980cb2e5bb298ca90802dd2f0c31738963514a91 (diff) | |
| download | forums-c969d4f83f3770bb26cb407c97aaa34f829e935f.tar forums-c969d4f83f3770bb26cb407c97aaa34f829e935f.tar.gz forums-c969d4f83f3770bb26cb407c97aaa34f829e935f.tar.bz2 forums-c969d4f83f3770bb26cb407c97aaa34f829e935f.tar.xz forums-c969d4f83f3770bb26cb407c97aaa34f829e935f.zip | |
Display a message if no topics or forums are selected when unsubscribing. #34855
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8997 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b8a6b8b297..afb794a9f7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -135,6 +135,7 @@ <li>[Fix] Do not display last post link and sort display options for search engines. (Bug #15088)</li> <li>[Fix] Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)</li> <li>[Fix] Don't show forum subscription link on categories. (Bug #34895)</li> + <li>[Fix] Display a message if no topics or forums are selected when unsubscribing. (Bug #34855)</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li> diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index c2fa50c79e..73e4af8b04 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -237,7 +237,10 @@ class ucp_main $l_unwatch .= '_TOPICS'; } $msg = $user->lang['UNWATCHED' . $l_unwatch]; - + } + else + { + $msg = $user->lang['NO_WATCHED_SELECTED']; } } else diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 3cf8d8cce3..4396f2abbd 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -316,6 +316,7 @@ $lang = array_merge($lang, array( 'NO_SAVED_DRAFTS' => 'No drafts saved.', 'NO_TO_RECIPIENT' => 'None', 'NO_WATCHED_FORUMS' => 'You are not subscribed to any forums.', + 'NO_WATCHED_SELECTED' => 'You have not selected any subscribed topics or forums.', 'NO_WATCHED_TOPICS' => 'You are not subscribed to any topics.', 'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.', |