From e64b754d4a2cc03008b7cc02e15eb2f3a0f715dd Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Mon, 1 Mar 2004 19:55:45 +0000 Subject: [PATCH] Migration to get_settings and away from globals. git-svn-id: https://develop.svn.wordpress.org/trunk@957 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/categories.php | 2 +- wp-admin/import-greymatter.php | 8 +++--- wp-admin/install.php | 1 - wp-admin/link-categories.php | 2 +- wp-admin/link-manager.php | 4 +-- wp-admin/moderation.php | 4 +-- wp-admin/options-discussion.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-permalink.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/options.php | 2 +- wp-admin/post.php | 6 ++--- wp-admin/profile.php | 2 +- wp-admin/templates.php | 4 +-- wp-admin/upgrade-functions.php | 1 - wp-admin/users.php | 4 +-- wp-includes/functions-formatting.php | 3 +-- wp-includes/functions.php | 7 +++-- wp-includes/template-functions-general.php | 3 +-- wp-includes/vars.php | 2 +- wp-login.php | 2 +- wp-mail.php | 30 +++++++++++----------- wp-rdf.php | 4 +-- wp-register.php | 4 +-- wp-rss.php | 2 +- wp-settings.php | 16 ------------ wp-trackback.php | 2 +- 27 files changed, 51 insertions(+), 72 deletions(-) diff --git a/wp-admin/categories.php b/wp-admin/categories.php index bb28878895..151b7ce050 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -134,7 +134,7 @@ default: $standalone = 0; require_once ('admin-header.php'); if ($user_level < 3) { - die("You have no right to edit the categories for this blog.
Ask for a promotion to your blog admin. :)"); + die("You have no right to edit the categories for this blog.
Ask for a promotion to your blog admin. :)"); } ?> diff --git a/wp-admin/import-greymatter.php b/wp-admin/import-greymatter.php index 6eed8347cd..41e2e38c28 100644 --- a/wp-admin/import-greymatter.php +++ b/wp-admin/import-greymatter.php @@ -101,7 +101,7 @@ textarea,input,select { $query = "INSERT INTO $tableusers (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,dateYMDhour,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','1','nickname')"; $result = mysql_query($query); if ($result==false) { - die ("ERROR: couldn't register an user... please contact the webmaster !"); + die ("ERROR: couldn't register an user!"); } echo "
  • user $user_login... Done
    • "; @@ -160,7 +160,7 @@ textarea,input,select { $query = "INSERT INTO $tableusers (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,dateYMDhour,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','0','nickname')"; $result = mysql_query($query); if ($result==false) { - die ("ERROR: couldn't register an user... please contact the webmaster !"); + die ("ERROR: couldn't register an user!"); } echo ": registered deleted user $user_login at level 0 "; } @@ -196,7 +196,7 @@ textarea,input,select { $result = mysql_query($query) or die(mysql_error()); if (!$result) - die ("Error in posting... contact the webmaster"); + die ("Error in posting..."); $sql2 = "SELECT * FROM $tableposts WHERE 1=1 ORDER BY ID DESC LIMIT 1"; $result2 = mysql_query($sql2); @@ -244,7 +244,7 @@ textarea,input,select { $sql3 = "INSERT INTO $tablecomments (comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_author_IP,comment_date,comment_content) VALUES ('$comment_post_ID','$comment_author','$comment_author_email','$comment_author_url','$comment_author_IP','$comment_date','$comment_content')"; $result3 = mysql_query($sql3); if (!$result3) - die ("There is an error with the database, it can't store your comment...
    Contact the webmaster"); + die ("There is an error with the database, it can't store your comment.."); } $comments=$c-4; echo ": imported $comments comment"; diff --git a/wp-admin/install.php b/wp-admin/install.php index 15b8474a6c..542218ba91 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -437,7 +437,6 @@ $option_data = array( "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(42,'default_category', 1, '1', 'by default posts will have this category', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(43,'subjectprefix', 3, 'blog:', 'subject prefix', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(44,'bodyterminator', 3, '___', 'body terminator string (starting from this string, everything will be ignored, including this string)', 8, 20)", -"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(45,'emailtestonly', 2, '0', 'set this to true to run in test mode', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(46,'use_phoneemail', 2, '0', 'some mobile phone email services will send identical subject & content on the same line if you use such a service, set use_phoneemail to true, and indicate a separator string', 8, 20)", "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(47,'phoneemail_separator', 3, ':::', 'when you compose your message, you\'ll type your subject then the separator string then you type your login:password, then the separator, then content', 8, 20)", // original options from options page diff --git a/wp-admin/link-categories.php b/wp-admin/link-categories.php index cfafbace62..dd5af66d49 100644 --- a/wp-admin/link-categories.php +++ b/wp-admin/link-categories.php @@ -280,7 +280,7 @@ updated $standalone=0; include_once ("./admin-header.php"); if ($user_level < get_settings('links_minadminlevel')) { - die("You have no right to edit the link categories for this blog.
    Ask for a promotion to your blog admin :)"); + die("You have do not have sufficient permissions to edit the link categories for this blog. :)"); } ?>