Changeset 3985

Timestamp:

07/05/2006 10:00:03 PM (19 years ago)

Author:

ryan

Message:

Use wp_die(). Props filosofo. fixes #2914

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (8 diffs)
• wp-admin/admin.php (modified) (2 diffs)
• wp-admin/categories.php (modified) (1 diff)
• wp-admin/comment.php (modified) (5 diffs)
• wp-admin/import/blogger.php (modified) (6 diffs)
• wp-admin/import/greymatter.php (modified) (1 diff)
• wp-admin/inline-uploading.php (modified) (4 diffs)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/link-import.php (modified) (1 diff)
• wp-admin/link-manager.php (modified) (1 diff)
• wp-admin/link.php (modified) (4 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/moderation.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/plugin-editor.php (modified) (2 diffs)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/profile-update.php (modified) (1 diff)
• wp-admin/templates.php (modified) (2 diffs)
• wp-admin/theme-editor.php (modified) (3 diffs)
• wp-admin/update-links.php (modified) (1 diff)
• wp-admin/users.php (modified) (5 diffs)
• wp-includes/comment.php (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)
• wp-mail.php (modified) (1 diff)
• wp-settings.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -7 +7 @@
     if ( 'page' == $_POST['post_type'] ) {
         if ( !current_user_can('edit_pages') )
-            die(__('You are not allowed to create pages on this blog.'));
+            wp_die(__('You are not allowed to create pages on this blog.'));
     } else {
         if ( !current_user_can('edit_posts') )
-            die(__('You are not allowed to create posts or drafts on this blog.'));
+            wp_die(__('You are not allowed to create posts or drafts on this blog.'));
     }
 
@@ -33 +33 @@
         if ( 'page' == $_POST['post_type'] ) {
             if ( !current_user_can('edit_others_pages') )
-                die(__('You cannot create pages as this user.'));
+                wp_die(__('You cannot create pages as this user.'));
         } else {
             if ( !current_user_can('edit_others_posts') )
-                die(__('You cannot post as this user.'));
+                wp_die(__('You cannot post as this user.'));
 
         }
@@ -152 +152 @@
     if ( 'page' == $_POST['post_type'] ) {
         if ( !current_user_can('edit_page', $post_ID) )
-            die(__('You are not allowed to edit this page.'));
+            wp_die(__('You are not allowed to edit this page.'));
     } else {
         if ( !current_user_can('edit_post', $post_ID) )
-            die(__('You are not allowed to edit this post.'));
+            wp_die(__('You are not allowed to edit this post.'));
     }
 
@@ -177 +177 @@
         if ( 'page' == $_POST['post_type'] ) {
             if ( !current_user_can('edit_others_pages') )
-                die(__('You cannot edit pages as this user.'));
+                wp_die(__('You cannot edit pages as this user.'));
         } else {
             if ( !current_user_can('edit_others_posts') )
-                die(__('You cannot edit posts as this user.'));
+                wp_die(__('You cannot edit posts as this user.'));
 
         }
@@ -252 +252 @@
 
     if (!current_user_can('edit_post', $comment_post_ID))
-        die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.'));
+        wp_die(__('You are not allowed to edit comments on this post, so you cannot edit this comment.'));
 
     $_POST['comment_author'] = $_POST['newcomment_author'];
@@ -531 +531 @@
 function edit_link($link_id = '') {
     if (!current_user_can('manage_links'))
-        die(__("Cheatin' uh ?"));
+        wp_die(__("Cheatin' uh ?"));
 
     $_POST['link_url'] = wp_specialchars($_POST['link_url']);
@@ -1522 +1522 @@
     switch ($code) {
         case 1 :
-            die(__('Sorry, can’t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.'));
+            wp_die(__('Sorry, can’t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.'));
 
         case 2 :
-            die(__('Sorry, can’t call files with their real path.'));
+            wp_die(__('Sorry, can’t call files with their real path.'));
 
         case 3 :
-            die(__('Sorry, that file cannot be edited.'));
+            wp_die(__('Sorry, that file cannot be edited.'));
     }
 }
@@ -1845 +1845 @@
     $new_file = $uploads['path'] . "/$filename";
     if ( false === @ move_uploaded_file($file['tmp_name'], $new_file) )
-        die(printf(__('The uploaded file could not be moved to %s.'), $file['path']));
+        wp_die(printf(__('The uploaded file could not be moved to %s.'), $file['path']));
 
     // Set correct file permissions

trunk/wp-admin/admin.php

@@ -46 +46 @@
     } else {
         if ( validate_file($plugin_page) ) {
-            die(__('Invalid plugin page'));
+            wp_die(__('Invalid plugin page'));
         }
 
         if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
-            die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+            wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
         if (! isset($_GET['noheader']))
@@ -66 +66 @@
 
     if ( validate_file($importer) ) {
-        die(__('Invalid importer.'));
+        wp_die(__('Invalid importer.'));
     }
 
     if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-        die(__('Cannot load importer.'));
+        wp_die(__('Cannot load importer.'));
 
     include(ABSPATH . "wp-admin/import/$importer.php");

trunk/wp-admin/categories.php

@@ -32 +32 @@
     // Don't delete the default cats.
     if ( $cat_ID == get_option('default_category') )
-        die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
     if ( $cat_ID == get_option('default_link_category') )
-        die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
+        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
 
     wp_delete_category($cat_ID);

trunk/wp-admin/comment.php

@@ -20 +20 @@
 
     if ( ! $comment = get_comment($comment) )
-        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)'));
+        wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)'));
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post.') );
+        wp_die( __('You are not allowed to edit comments on this post.') );
 
     $comment = get_comment_to_edit($comment);
@@ -43 +43 @@
 
     if ( ! $comment = get_comment($comment) )
-        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+        wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+        wp_die( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
     echo "<div class='wrap'>\n";
@@ -91 +91 @@
 
     $postdata = get_post($p) or 
-        die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+        wp_die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
     if ( ! $comment = get_comment($comment) )
-             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit-comments.php'));
+             wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit-comments.php'));
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post.') );
+        wp_die( __('You are not allowed to edit comments on this post.') );
 
     if ( 'spam' == $_REQUEST['delete_type'] )
@@ -124 +124 @@
 
     if ( ! $comment = get_comment($comment) )
-        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+        wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+        wp_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
 
     wp_set_comment_status($comment->comment_ID, "hold");
@@ -151 +151 @@
 
     if ( ! $comment = get_comment($comment) )
-        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+        wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
+        wp_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
     wp_set_comment_status($comment->comment_ID, "approve");

trunk/wp-admin/import/blogger.php

@@ -242 +242 @@
             preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)</a>#U', $response['body'], $blogsary);
             if ( ! count( $blogsary[1] < 1 ) )
-                die(__('No blogs found for this user.'));
+                wp_die(__('No blogs found for this user.'));
             $this->import['blogs'] = array();
             $template = '<MainPage><br /><br /><br /><p>'.__('Are you looking for %title%? It is temporarily out of service. Please try again in a few minutes. Meanwhile, discover <a href="http://wordpress.org/">a better blogging tool</a>.').'</p><BloggerArchives><a class="archive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br /></BloggerArchives></MainPage><ArchivePage><Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger></ArchivePage>';
@@ -307 +307 @@
                             $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);
                             if ( $response['code'] >= 400 )
-                                die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
+                                wp_die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
                             $this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';
                             sleep(2);
@@ -322 +322 @@
                     $response = $this->post_blogger($posturl, $headers, $paramary);
                     if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
-                        die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));
+                        wp_die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));
                 }
                 $output .= "<del><p>$blog_opt</p></del>\n";
@@ -365 +365 @@
         $bloghtml = $this->get_blogger($this->import['blogs'][$_GET['blog']]['url']);
         if (! strstr($bloghtml['body'], '<a class="archive"') )
-            die(__('Your Blogger blog did not take the new template or did not respond.'));
+            wp_die(__('Your Blogger blog did not take the new template or did not respond.'));
         preg_match_all('#<a class="archive" href="([^"]*)"#', $bloghtml['body'], $archives);
         foreach ($archives[1] as $archive) {
@@ -547 +547 @@
                         sleep(2);
                         if ( $response['code'] >= 400 )
-                            die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );
+                            wp_die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );
                     }
                 }
@@ -616 +616 @@
             }
 //echo "Step $step.";
-//die('<pre>'.print_r($this->import,1).'</pre');
+//wp_die('<pre>'.print_r($this->import,1).'</pre');
             switch ($step) {
                 case 0 :

trunk/wp-admin/import/greymatter.php

@@ -88 +88 @@
 
         if (!chdir($archivespath))
-            die("Wrong path, $archivespath\ndoesn't exist\non the server");
+            wp_die("Wrong path, $archivespath\ndoesn't exist\non the server");
 
         if (!chdir($gmpath))
-            die("Wrong path, $gmpath\ndoesn't exist\non the server");
+            wp_die("Wrong path, $gmpath\ndoesn't exist\non the server");
             
         $this->header();

trunk/wp-admin/inline-uploading.php

@@ -6 +6 @@
 
 if (!current_user_can('upload_files'))
-    die(__('You do not have permission to upload files.'));
+    wp_die(__('You do not have permission to upload files.'));
 
 wp_reset_vars(array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'attachment'));
@@ -23 +23 @@
 
 if ( !current_user_can('edit_post', (int) $attachment) )
-    die(__('You are not allowed to delete this attachment.').' <a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">".__('Go back').'</a>');
+    wp_die(__('You are not allowed to delete this attachment.').' <a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">".__('Go back').'</a>');
 
 wp_delete_attachment($attachment);
@@ -39 +39 @@
 
 if ( isset($file['error']) )
-    die($file['error'] . '<br /><a href="' . basename(__FILE__) . '?action=upload&post=' . $post . '">'.__('Back to Image Uploading').'</a>');
+    wp_die($file['error'] . '<br /><a href="' . basename(__FILE__) . '?action=upload&post=' . $post . '">'.__('Back to Image Uploading').'</a>');
 
 $url = $file['url'];
@@ -277 +277 @@
 
 default:
-die(__('This script was not meant to be called directly.'));
+wp_die(__('This script was not meant to be called directly.'));
 }
 

trunk/wp-admin/install.php

@@ -75 +75 @@
 <?php
 // Let's check to make sure WP isn't already installed.
-if ( is_blog_installed() ) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+if ( is_blog_installed() ) wp_die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
 
 switch($step) {

trunk/wp-admin/link-import.php

@@ -90 +90 @@
 
                     if ( isset($file['error']) )
-                        die($file['error']);
+                        wp_die($file['error']);
 
                     $url = $file['url'];

trunk/wp-admin/link-manager.php

@@ -23 +23 @@
 
 if (!current_user_can('manage_links'))
-    die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
+    wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
 
 switch ($order_by) {

trunk/wp-admin/link.php

@@ -19 +19 @@
         // check the current user's level first.
         if (!current_user_can('manage_links'))
-            die(__("Cheatin' uh ?"));
+            wp_die(__("Cheatin' uh ?"));
 
         //for each link id (in $linkcheck[]) change category to selected value
@@ -43 +43 @@
         // check the current user's level first.
         if (!current_user_can('manage_links'))
-            die(__("Cheatin' uh ?"));
+            wp_die(__("Cheatin' uh ?"));
 
         //for each link id (in $linkcheck[]) change category to selected value
@@ -80 +80 @@
 
         if (!current_user_can('manage_links'))
-            die(__("Cheatin' uh ?"));
+            wp_die(__("Cheatin' uh ?"));
 
         wp_delete_link($link_id);
@@ -96 +96 @@
         include_once ('admin-header.php');
         if (!current_user_can('manage_links'))
-            die(__('You do not have sufficient permissions to edit the bookmarks for this blog.'));
+            wp_die(__('You do not have sufficient permissions to edit the bookmarks for this blog.'));
 
         $link_id = (int) $_GET['link_id'];
 
         if (!$link = get_link_to_edit($link_id))
-            die(__('Link not found.'));
+            wp_die(__('Link not found.'));
 
         include ('edit-link-form.php');

trunk/wp-admin/menu.php

@@ -119 +119 @@
 
 if (! user_can_access_admin_page()) {
-    die( __('You do not have sufficient permissions to access this page.') );
+    wp_die( __('You do not have sufficient permissions to access this page.') );
 }
 

trunk/wp-admin/moderation.php

@@ -22 +22 @@
 
     if ( ! current_user_can('moderate_comments') )
-    die('<p>'.__('Your level is not high enough to moderate comments.').'</p>');
+    wp_die('<p>'.__('Your level is not high enough to moderate comments.').'</p>');
 
     $item_ignored = 0;

trunk/wp-admin/page.php

@@ -111 +111 @@
 
     if ( !current_user_can('delete_page', $page_id) )
-        die( __('You are not allowed to delete this page.') );
+        wp_die( __('You are not allowed to delete this page.') );
 
     if ( $page->post_type == 'attachment' ) {
         if ( ! wp_delete_attachment($page_id) )
-            die( __('Error in deleting...') );
+            wp_die( __('Error in deleting...') );
     } else {
         if ( !wp_delete_post($page_id) ) 
-            die( __('Error in deleting...') );
+            wp_die( __('Error in deleting...') );
     }
 

trunk/wp-admin/plugin-editor.php

@@ -24 +24 @@
 
     if ( !current_user_can('edit_plugins') )
-        die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -44 +44 @@
     require_once('admin-header.php');
     if ( !current_user_can('edit_plugins') )
-        die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
 
     update_recently_edited("wp-content/plugins/$file");

trunk/wp-admin/post.php

@@ -118 +118 @@
 
     if ( !current_user_can('delete_post', $post_id) )
-        die( __('You are not allowed to delete this post.') );
+        wp_die( __('You are not allowed to delete this post.') );
 
     if ( $post->post_type == 'attachment' ) {
         if ( ! wp_delete_attachment($post_id) )
-            die( __('Error in deleting...') );
+            wp_die( __('Error in deleting...') );
     } else {
         if ( !wp_delete_post($post_id) ) 
-            die( __('Error in deleting...') );
+            wp_die( __('Error in deleting...') );
     }
 

trunk/wp-admin/profile-update.php

@@ -8 +8 @@
 
 if ( !$_POST )
-    die( __('No post?') );
+    wp_die( __('No post?') );
 
 $errors = edit_user($user_ID);

trunk/wp-admin/templates.php

@@ -26 +26 @@
 
     if ( ! current_user_can('edit_files') )
-        die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -51 +51 @@
 
     if ( ! current_user_can('edit_files') )
-        die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     if ( strstr( $file, 'wp-config.php' ) )
-    die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
+    wp_die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
 
     update_recently_edited($file);

trunk/wp-admin/theme-editor.php

@@ -17 +17 @@
 
 if ( ! isset($themes[$theme]) )
-    die(__('The requested theme does not exist.'));
+    wp_die(__('The requested theme does not exist.'));
 
 $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
@@ -37 +37 @@
 
     if ( !current_user_can('edit_themes') )
-        die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
     $newcontent = stripslashes($_POST['newcontent']);
@@ -58 +58 @@
     require_once('admin-header.php');
     if ( !current_user_can('edit_themes') )
-        die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
+        wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
 
     update_recently_edited($file);

trunk/wp-admin/update-links.php

@@ -4 +4 @@
 
 if ( !get_option('use_linksupdate') )
-    die(__('Feature disabled.'));
+    wp_die(__('Feature disabled.'));
 
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
 
 if ( !$link_uris )
-    die('No links');
+    wp_die('No links');
 
 $link_uris = urlencode( join( $link_uris, "\n" ) );

trunk/wp-admin/users.php

@@ -129 +129 @@
 
     if ( !current_user_can('edit_users') )
-        die(__('You can’t edit users.'));
+        wp_die(__('You can’t edit users.'));
 
     $userids = $_POST['users'];
@@ -135 +135 @@
     foreach($userids as $id) {
         if ( ! current_user_can('edit_user', $id) )
-            die(__('You can’t edit that user.'));
+            wp_die(__('You can’t edit that user.'));
         // The new role of the current user must also have edit_users caps
         if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
@@ -159 +159 @@
 
     if ( !current_user_can('delete_users') )
-        die(__('You can’t delete users.'));
+        wp_die(__('You can’t delete users.'));
 
     $userids = $_POST['users'];
@@ -167 +167 @@
     foreach ( (array) $userids as $id) {
         if ( ! current_user_can('delete_user', $id) )
-            die(__('You can’t delete that user.'));
+            wp_die(__('You can’t delete that user.'));
 
         if($id == $current_user->id) {
@@ -253 +253 @@
 
     if ( ! current_user_can('create_users') )
-        die(__('You can’t create users.'));
+        wp_die(__('You can’t create users.'));
 
     $user_id = add_user();

trunk/wp-includes/comment.php

@@ -182 +182 @@
     $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
     if ( $wpdb->get_var($dupe) )
-        die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
+        wp_die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
 
     // Simple flood-protection
@@ -190 +190 @@
         if ( ($time_newcomment - $time_lastcomment) < 15 ) {
             do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-            die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
+            wp_die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
         }
     }

trunk/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php

@@ -72 +72 @@
             fclose($fh);
         } else
-            die("Error opening tmp file.");
+            wp_die("Error opening tmp file.");
 
         $data = shell_exec($this->cmd);

trunk/wp-login.php

@@ -99 +99 @@
 
     if (!$user_email || $user_email != $_POST['email'])
-        die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
+        wp_die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
 
 do_action('retreive_password', $user_login);  // Misspelled and deprecated.
@@ -133 +133 @@
     $key = preg_replace('/a-z0-9/i', '', $_GET['key']);
     if ( empty($key) )
-        die( __('Sorry, that key does not appear to be valid.') );
+        wp_die( __('Sorry, that key does not appear to be valid.') );
     $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_activation_key = '$key'");
     if ( !$user )
-        die( __('Sorry, that key does not appear to be valid.') );
+        wp_die( __('Sorry, that key does not appear to be valid.') );
 
     do_action('password_reset');

trunk/wp-mail.php

@@ -18 +18 @@
 
 $count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass'));
-if (0 == $count) die(__('There doesn’t seem to be any new mail.'));
+if (0 == $count) wp_die(__('There doesn’t seem to be any new mail.'));
 
 

trunk/wp-settings.php

@@ -6 +6 @@
 
     if ( isset($_REQUEST['GLOBALS']) )
-        die('GLOBALS overwrite attempt detected');
+        wp_die('GLOBALS overwrite attempt detected');
 
     // Variables that shouldn't be unset
@@ -48 +48 @@
 
 if ( !(phpversion() >= '4.1') )
-    die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
+    wp_die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
 
 if ( !extension_loaded('mysql') )
-    die( 'Your PHP installation appears to be missing the MySQL which is required for WordPress.' );
+    wp_die( 'Your PHP installation appears to be missing the MySQL which is required for WordPress.' );
 
 function timer_start() {
@@ -112 +112 @@
     else
         $link = 'wp-admin/install.php';
-    die(sprintf(__("It doesn't look like you've installed WP yet. Try running <a href='%s'>install.php</a>."), $link));
+    wp_die(sprintf(__("It doesn't look like you've installed WP yet. Try running <a href='%s'>install.php</a>."), $link));
 }