aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthe_systech <the_systech@users.sourceforge.net>2002-04-03 20:14:47 +0000
committerthe_systech <the_systech@users.sourceforge.net>2002-04-03 20:14:47 +0000
commit5a40ff47f06a2961d99d2b9f6de4e05e5802194b (patch)
tree7d4e9bf523f9538fc573a8a28cde2a248f850be7
parentaeabd5abaa8c4b8cc2f384714414397f8f4cc720 (diff)
downloadforums-5a40ff47f06a2961d99d2b9f6de4e05e5802194b.tar
forums-5a40ff47f06a2961d99d2b9f6de4e05e5802194b.tar.gz
forums-5a40ff47f06a2961d99d2b9f6de4e05e5802194b.tar.bz2
forums-5a40ff47f06a2961d99d2b9f6de4e05e5802194b.tar.xz
forums-5a40ff47f06a2961d99d2b9f6de4e05e5802194b.zip
Just me being anal again... A couple of miss-spellings in error messages
git-svn-id: file:///svn/phpbb/trunk@2470 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/admin/admin_db_utilities.php4
-rw-r--r--phpBB/includes/usercp_activate.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index 7dffff981c..00762f567c 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -489,7 +489,7 @@ function get_table_content_postgresql($table, $handler)
if (!$result)
{
- message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
+ message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
}
$i_num_fields = $db->sql_numfields($result);
@@ -578,7 +578,7 @@ function get_table_content_mysql($table, $handler)
if (!$result)
{
- message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
+ message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
}
if($db->sql_numrows($result) > 0)
diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php
index 4e2e865460..6edff84e52 100644
--- a/phpBB/includes/usercp_activate.php
+++ b/phpBB/includes/usercp_activate.php
@@ -46,7 +46,7 @@ if ( $result = $db->sql_query($sql) )
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($board_config['smtp_delivery']);
- $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+ $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template('admin_welcome_activated', $row['user_lang']);
$emailer->email_address($row['user_email']);
@@ -93,4 +93,4 @@ else
message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
}
-?> \ No newline at end of file
+?>