diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:50:50 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:50:50 +0000 |
| commit | 168f0e5fd0af00c3a0665ae9e2e103a8521789f5 (patch) | |
| tree | 06005d7d99c30c4573abcc9f5a7622a302e23fb8 | |
| parent | fdfd3271d66e8b2be4406c51b8f1e14a189625ad (diff) | |
| download | forums-168f0e5fd0af00c3a0665ae9e2e103a8521789f5.tar forums-168f0e5fd0af00c3a0665ae9e2e103a8521789f5.tar.gz forums-168f0e5fd0af00c3a0665ae9e2e103a8521789f5.tar.bz2 forums-168f0e5fd0af00c3a0665ae9e2e103a8521789f5.tar.xz forums-168f0e5fd0af00c3a0665ae9e2e103a8521789f5.zip | |
Spot the mess ups
git-svn-id: file:///svn/phpbb/trunk@544 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/constants.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/message.php | 20 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 6 |
4 files changed, 17 insertions, 15 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 935ed37771..8f4ba92153 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -27,8 +27,8 @@ // // Debug Level -//define(DEBUG, 1); // Debugging on -define(DEBUG, 0); // Debugging off +define(DEBUG, 1); // Debugging on +//define(DEBUG, 0); // Debugging off // User Levels <- Do not change the values of USER or ADMIN define(DELETED, -1); diff --git a/phpBB/includes/message.php b/phpBB/includes/message.php index 5779192834..58a0df3db1 100644 --- a/phpBB/includes/message.php +++ b/phpBB/includes/message.php @@ -86,42 +86,42 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "", break; case SQL_CONNECT: - $msg_title = $lang['General_error']; + $msg_title = $lang['General_Error']; $msg_text = $lang['Error_database_connect']; break; case SQL_QUERY: - if(!$msg_text) + if($msg_text == "") { $msg_text = $lang['An_error_occured']; } - if(!$msg_title) + if($msg_title == "") { - $msg_title = $lang['General_error']; + $msg_title = $lang['General_Error']; } break; case SESSION_CREATE: - $msg_title = $lang['General_error']; + $msg_title = $lang['General_Error']; $msg_text = $lang['Error_session']; break; case GENERAL_ERROR: - if(!$msg_text) + if($msg_text == "") { $msg_text = $lang['An_error_occured']; } - if(!$msg_title) + if($msg_title == "") { - $msg_title = $lang['General_error']; + $msg_title = $lang['General_Error']; } break; } if(DEBUG) { - if($line != "" && $file != "" && $msg_code != GENERAL_MESSAGE) + if($err_line != "" && $err_file != "") { - $msg_text .= "<br /><br /><u>DEBUG INFO</u></br /><br>Line: " . $err_line . "<br />File: " . $file; + $msg_text .= "<br /><br /><u>DEBUG INFO</u></br /><br>Line : " . $err_line . "<br />File : " . $err_file; } } diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 604550e668..589746d4b4 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -79,6 +79,7 @@ $lang['Next'] = "Next"; $lang['Previous'] = "Previous"; $lang['Goto_page'] = "Goto page"; $lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages +$lang['Pages'] = "Pages"; $lang['of'] = "of"; // See Page above $lang['Go'] = "Go"; @@ -323,6 +324,7 @@ $lang['You_been_banned'] = "You have been banned from this forum<br>Please conta $lang['No_topics_post_one'] = "There are no posts in this forum<br>Click on the <b>Post New Topic</b> link on this page to post one"; $lang['General_Error'] = "General Error"; +$lang['An_error_occured'] = "An Error Occured"; $lang['Error_database_connect'] = "Could not connect to database<br>Please check your configuration settings"; $lang['Error_session'] = "Error creating session<br>Could not log you in, please go back and try again"; $lang['Error_login'] = "Login Failed<br>You have specified an incorrect/inactive username or invalid password, please go back and try again"; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 5c573deb41..51cb796bce 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -154,11 +154,11 @@ if(!$result = $db->sql_query($sql)) if(DEBUG) { $dberror = $db->sql_error(); - message_die(SQL_QUERY, "Couldn't obtain topic information.<br>Reason: ".$dberror['message']."<br>Query: $sql", "", __LINE__, __FILE__); + message_die(SQL_QUERY, "Couldn't obtain topic information<br><br><b>DEBUG INFO</b><br><br>Reason : " . $dberror['message'] . "<br>Query : $sql<br>File : " . __FILE__ . "<br>Line : " . __LINE__ . "<br>", ""); } else { - message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist']); + message_die(GENERAL_MESSAGE, $lang['Topic_post_not_exist']); } } @@ -178,7 +178,7 @@ if(!$total_rows = $db->sql_numrows($result)) if(DEBUG) { $error = $db->sql_error(); - message_die(GENERAL_ERROR, "The forum/topic you selected does not exist.<br>Reason: ".$error['message']."<br>Query: $sql", "", __LINE__, __FILE__); + message_die(GENERAL_ERROR, "The forum/topic you selected does not exist<br><br><b><u>DEBUG INFO</u></b><br><br>Reason : " . $error['message'] . "<br><br>Query : $sql<br><br>File : " . __FILE__ . "<br><br>Line : " . __LINE__ . "<br>", ""); } else { |