diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-17 05:13:21 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-17 05:13:21 +0000 |
| commit | dcde945443442d36e2118f758a0b0854a5374582 (patch) | |
| tree | 00d0555949f82b93bdd718da7a7437c3eb6f42d1 /phpBB | |
| parent | baddbe37773f70a6cc6be96d086b4c61e5108537 (diff) | |
| download | forums-dcde945443442d36e2118f758a0b0854a5374582.tar forums-dcde945443442d36e2118f758a0b0854a5374582.tar.gz forums-dcde945443442d36e2118f758a0b0854a5374582.tar.bz2 forums-dcde945443442d36e2118f758a0b0854a5374582.tar.xz forums-dcde945443442d36e2118f758a0b0854a5374582.zip | |
Fixed viewforum so topic titles show up when you don't have words in your censor list
git-svn-id: file:///svn/phpbb/trunk@896 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/groupcp.php | 5 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 1 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index afb2e4d2bf..d30576264d 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -51,6 +51,11 @@ include($phpbb_root_path . 'includes/page_header.'.$phpEx); // if( isset($HTTP_POST_VARS['joingroup']) ) { + // If the user isn't logged in give them an error + if(!$userdata['session_logged_in']) + { + message_die(GENERAL_ERROR, $lang['Not_logged_in'], $lang['Error'], __LINE__, __FILE__); + } $sql = "INSERT INTO ".USER_GROUP_TABLE." (group_id, user_id, user_pending) values (".$HTTP_POST_VARS[POST_GROUPS_URL].", ".$userdata['user_id'].", 1)"; if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION)) { diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 3e575ba1b1..ec747c78b3 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -476,6 +476,7 @@ $lang['Group_request'] = "A request to join your group has been made"; $lang['Approve_selected'] = "Approve Selected"; $lang['Deny_selected'] = "Deny Selected"; +$lang['Not_logged_in'] = "You must be logged in to join a group."; $lang['This_open_group'] = "This is an open group, click to request membership"; $lang['This_closed_group'] = "This is a closed group, no more users accepted"; diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index d3e0abfbcb..9f39dcb59e 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -267,7 +267,7 @@ $total_announcements = $db->sql_numrows($ta_result); // // Define censored word matches // -$sql = "SELECT word, replacement +$sql = "SELECT word, replacement FROM " . WORDS_TABLE; if( !$words_result = $db->sql_query($sql) ) { |