diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 091b9e61f6..5cb53e37b8 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -427,10 +427,10 @@ case 'get-tagcloud' : die('-1'); $tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); - + if ( empty( $tags ) ) die( __('No tags found!') ); - + foreach ( $tags as $key => $tag ) { $tags[ $key ]->link = '#'; $tags[ $key ]->id = $tag->term_id; @@ -440,9 +440,9 @@ case 'get-tagcloud' : if ( empty($return) ) die('0'); - + echo $return; - + exit; break; case 'add-comment' : diff --git a/wp-admin/comment.php b/wp-admin/comment.php index c08af35892..129d621137 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -22,7 +22,7 @@ if ( isset( $_POST['deletecomment'] ) ) * * @param string $msg Error Message. Assumed to contain HTML and be sanitized. */ -function comment_footer_die( $msg ) { // +function comment_footer_die( $msg ) { // echo "

$msg

"; include('admin-footer.php'); die; diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index b6dd2bfa1a..2cc9d41696 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -106,7 +106,7 @@ li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, -#plugin-information .action-button a, +#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { color: #fff; @@ -342,7 +342,7 @@ a:focus { color: #d54e21; } -a:hover, +a:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, @@ -625,17 +625,17 @@ li.widget-list-control-item h4, background-color: #ffffe0; } -#the-comment-list .approve a { - color: #006505; -} +#the-comment-list .approve a { + color: #006505; +} -#the-comment-list .unapprove a { - color: #d98500; -} +#the-comment-list .unapprove a { + color: #d98500; +} -#the-comment-list .delete a { - color: #bc0b0b; -} +#the-comment-list .delete a { + color: #bc0b0b; +} .plugins tr { background-color: #fff; diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 1c175c1fb6..67f3a4a2d0 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -106,7 +106,7 @@ li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, -#plugin-information .action-button a, +#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { color: #fff; @@ -342,7 +342,7 @@ a:focus { color: #d54e21; } -a:hover, +a:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, @@ -625,17 +625,17 @@ li.widget-list-control-item h4, background-color: #ffffe0; } -#the-comment-list .approve a { - color: #006505; -} +#the-comment-list .approve a { + color: #006505; +} -#the-comment-list .unapprove a { - color: #d98500; -} +#the-comment-list .unapprove a { + color: #d98500; +} -#the-comment-list .delete a { - color: #bc0b0b; -} +#the-comment-list .delete a { + color: #bc0b0b; +} .plugins tr { background-color: #fff; diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 814e964d37..bf6ac84f93 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -188,7 +188,7 @@ div.postbox div.inside { clear: right; position: relative; top: -5px; - padding: 2px 11px; + padding: 2px 11px; } /* Recent Comments */ diff --git a/wp-admin/css/farbtastic.css b/wp-admin/css/farbtastic.css index 5313232f19..71ad3c13d0 100644 --- a/wp-admin/css/farbtastic.css +++ b/wp-admin/css/farbtastic.css @@ -27,6 +27,6 @@ width: 17px; height: 17px; margin: -8px 0 0 -8px; - overflow: hidden; + overflow: hidden; background: url(../images/marker.png) no-repeat; } \ No newline at end of file diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 0c9603a1e7..d9c91a343c 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -72,7 +72,7 @@ table { #wpbody { clear: both; margin-left: 175px; -} +} .folded #wpbody { margin-left: 60px; diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css index 698c25f4c5..f66409e1d2 100644 --- a/wp-admin/css/ie-rtl.css +++ b/wp-admin/css/ie-rtl.css @@ -50,7 +50,7 @@ div#dashboard-widgets { .widefat th input { margin: 0 5px 0 0; } -/* ---------- add by navid */ +/* ---------- add by navid */ #TB_window { width: 670px; position: absolute; diff --git a/wp-admin/css/media-rtl.css b/wp-admin/css/media-rtl.css index ee3fd63e2f..5aeab26fa5 100644 --- a/wp-admin/css/media-rtl.css +++ b/wp-admin/css/media-rtl.css @@ -88,6 +88,6 @@ button.dismiss { margin-right: 0; margin-left: 15px; } -#gallery-settings .align .field label { +#gallery-settings .align .field label { margin: 0 0 0 1.5em; } diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 866c23a176..bd78e8a961 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -146,24 +146,24 @@ class Custom_Image_Header { jQuery('#textcolor').val(color); farbtastic.setColor(color); } - + jQuery(document).ready(function() { jQuery('#pickcolor').click(function() { jQuery('#colorPickerDiv').show(); }); - + jQuery('#hidetext').click(function() { toggle_text(); }); - + farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); }); pickColor('#'); - + toggle_text(); }); - + jQuery(document).mousedown(function(){ // Make the picker disappear, since we're using it in an independant div hide_picker(); diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php index b6549601c8..42cd3df024 100644 --- a/wp-admin/edit-attachment-rows.php +++ b/wp-admin/edit-attachment-rows.php @@ -15,13 +15,13 @@ if ( have_posts() ) { ?> - + - + $column_display_name ) { - + diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 4b5541a65d..9445d184f5 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -20,7 +20,7 @@ if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spa $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] ); $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); - $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam; + $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam; if ( $post_id ) $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); wp_redirect( $redirect_to ); diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index e24e0e7e48..531db65b08 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -109,7 +109,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) ); $url = get_comment_author_url(); if ( ! empty( $url ) && 'http://' != $url ) { $link = "" . __('visit site') . ""; - printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) ); + printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) ); } else { _e( 'URL:' ); } ?> diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index 0ef38e17b7..40494e3c6e 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -333,7 +333,7 @@ function link_advanced_meta_box($link) { -

+

@@ -365,7 +365,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-
- add_query_arg( 'pagenum', '%#%' ), 'format' => '', @@ -239,9 +239,9 @@ if ( $page_links )

- 'edit')); + wp_tag_cloud(array('link' => 'edit')); else wp_tag_cloud(); ?> diff --git a/wp-admin/export.php b/wp-admin/export.php index 20d526b9c6..dbe1b143c8 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -24,7 +24,7 @@ require_once ('admin-header.php');
-

+

diff --git a/wp-admin/import.php b/wp-admin/import.php index 64408f0332..9c321e43de 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -15,7 +15,7 @@ $parent_file = 'tools.php';
-

+

wp_content_dir() . '/themes'; } - + /** * Locates a folder on the remote filesystem. * @@ -136,7 +136,7 @@ class WP_Filesystem_Base { * * @since 2.7 * @access public - * + * * @param string $folder the folder to locate * @return string The location of the remote path. */ @@ -164,7 +164,7 @@ class WP_Filesystem_Base { * * @since 2.7 * @access private - * + * * @param string $folder the folder to locate * @param string $base the folder to start searching from * @param bool $loop if the function has recursed, Internal use only diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php index d8a774db09..a2805da80d 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpext.php +++ b/wp-admin/includes/class-wp-filesystem-ftpext.php @@ -79,10 +79,10 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base { $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username'])); return false; } - + //Set the Connection to use Passive FTP - @ftp_pasv( $this->link, true ); - + @ftp_pasv( $this->link, true ); + return true; } diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php index 8365219559..6da852d7e5 100644 --- a/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -90,12 +90,12 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { $this->options['username'] = $opt['username']; if ( ( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) ) ) { - $this->options['public_key'] = $opt['public_key']; + $this->options['public_key'] = $opt['public_key']; $this->options['private_key'] = $opt['private_key']; - + $this->options['hostkey'] = array("hostkey" => "ssh-rsa"); - - $this->keys = true; + + $this->keys = true; } @@ -105,18 +105,18 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { } else { $this->options['password'] = $opt['password']; } - + } function connect() { $this->debug("connect();"); - + if ( ! $this->keys ) { - $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']); + $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']); } else { - $this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']); + $this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']); } - + if ( ! $this->link ) { $this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port'])); return false; @@ -358,7 +358,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { function touch($file, $time = 0, $atime = 0) { //Not implmented. } - + function mkdir($path, $chmod = null, $chown = false, $chgrp = false) { $this->debug("mkdir();"); $path = untrailingslashit($path); diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 473cc8a450..314fc14de8 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -134,7 +134,7 @@ function _wp_dashboard_control_callback( $dashboard, $meta_box ) { wp_dashboard_trigger_widget_control( $meta_box['id'] ); echo "

"; - echo ''; + echo ''; } /** @@ -276,7 +276,7 @@ function wp_dashboard_right_now() { } else { printf(__ngettext('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); } - + echo '

'; update_right_now_message(); @@ -304,7 +304,7 @@ function wp_dashboard_quick_press() { 'orderby' => 'modified', 'order' => 'DESC' ) ); - + if ( $drafts_query->posts ) $drafts =& $drafts_query->posts; } @@ -329,7 +329,7 @@ function wp_dashboard_quick_press() {
- +

@@ -437,7 +437,7 @@ function wp_dashboard_recent_comments() { if ( current_user_can('edit_posts') ) { ?>

$widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) ); } diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 0560bcd043..a68606719e 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -662,11 +662,11 @@ function request_filesystem_credentials($form_post, $type = '', $error = false) $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']); $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']); $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']); - + // Check to see if we are setting the public/private keys for ssh $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : $credentials['public_key']); - $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']); - + $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']); + if ( strpos($credentials['hostname'], ':') ) list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2); @@ -704,7 +704,7 @@ jQuery(function($){ }); jQuery("#ftp, #ftps").click(function () { jQuery("#ssh_keys").hide(); - }); + }); }); --> diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index c4c02e4e2f..8069b97784 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -94,7 +94,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata['height'] = $imagesize[1]; list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']); $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'"; - + // Make the file path relative to the upload dir if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { // Get upload directory if ( 0 === strpos($file, $uploads['basedir']) ) {// Check that the upload base exists in the file path diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 7ea8247b76..6b989a6655 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -102,7 +102,7 @@ function the_media_upload_tabs() { function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') { $htmlalt = ( empty($alt) ) ? $title : $alt; - + $html = get_image_tag($id, $htmlalt, $title, $align, $size); $rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : ''; @@ -473,7 +473,7 @@ function media_upload_image() { $errors['upload_notice'] = __('Saved.'); return media_upload_gallery(); } - + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); @@ -501,10 +501,10 @@ function media_sideload_image($file, $post_id, $desc = null) { @unlink($file_array['tmp_name']); $file_array['tmp_name'] = ''; } - + $id = media_handle_sideload($file_array, $post_id, $desc); $src = $id; - + if ( is_wp_error($id) ) { @unlink($file_array['tmp_name']); return $id; @@ -567,7 +567,7 @@ function media_upload_audio() { if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id ); - + return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id ); } @@ -620,7 +620,7 @@ function media_upload_video() { if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id ); - + return wp_iframe( 'media_upload_type_form', 'video', $errors, $id ); } @@ -673,7 +673,7 @@ function media_upload_file() { if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id ); - + return wp_iframe( 'media_upload_type_form', 'file', $errors, $id ); } @@ -731,16 +731,16 @@ function media_upload_library() { * @return unknown */ function image_align_input_fields($post, $checked='') { - + $alignments = array('none' => 'None', 'left' => 'Left', 'center' => 'Center', 'right' => 'Right'); if ( !array_key_exists($checked, $alignments) ) $checked = 'none'; - + $out = array(); foreach ($alignments as $name => $label) { - + $out[] = ""; } return join("\n", $out); @@ -756,9 +756,9 @@ function image_align_input_fields($post, $checked='') { * @return unknown */ function image_size_input_fields($post, $checked='') { - + // get a list of the actual pixel dimensions of each possible intermediate version of this image - $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size')); + $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size')); foreach ( $size_names as $size => $name) { $downsize = image_downsize($post->ID, $size); @@ -772,19 +772,19 @@ function image_size_input_fields($post, $checked='') { // if $checked was not specified, default to the first available size that's bigger than a thumbnail if ( !$checked && $enabled && 'thumbnail' != $size ) $checked = $size; - + $html = "
"; - + $html .= ""; // only show the dimensions if that choice is available if ( $enabled ) $html .= " "; - + $html .= '
'; - + $out[] = $html; } - + return array( 'label' => __('Size'), 'input' => 'html', @@ -811,7 +811,7 @@ function image_link_input_fields($post, $url_type='') { $url = $file; elseif ( $url_type == 'post' ) $url = $link; - + return "
@@ -842,7 +842,7 @@ function image_attachment_fields_to_edit($form_fields, $post) { 'input' => 'html', 'html' => image_align_input_fields($post, get_option('image_default_align')), ); - + $form_fields['image-size'] = image_size_input_fields($post, get_option('image_default_size')); } return $form_fields; @@ -1287,7 +1287,7 @@ SWFUpload.onload = function() { file_dialog_complete_handler : fileDialogComplete, swfupload_pre_load_handler: swfuploadPreLoad, swfupload_load_failed_handler: swfuploadLoadFailed, - custom_settings : { + custom_settings : { degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available }, @@ -1299,7 +1299,7 @@ SWFUpload.onload = function() {
- +

@@ -1361,7 +1361,7 @@ jQuery(function($){ -->
- diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 092b0e2845..42a64e8f01 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -132,7 +132,7 @@ function install_dashboard() { Tag: Searches for plugins tagged as such') ?>
Author: Searches for plugins created by the Author, or which the Author contributed to.') ?>

- +

@@ -140,7 +140,7 @@ function install_dashboard() {
- +

sections[ $section ]) ) $section = array_shift( $section_titles = array_keys((array)$api->sections) ); - iframe_header( __('Plugin Install') ); + iframe_header( __('Plugin Install') ); echo "
\n"; echo "
    \n"; foreach ( (array)$api->sections as $section_name => $content ) { @@ -505,9 +505,9 @@ function install_plugin_information() {
tested, '>') ) + if ( version_compare($GLOBALS['wp_version'], $api->tested, '>') ) echo '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; - else if ( version_compare($GLOBALS['wp_version'], $api->requires, '<') ) + else if ( version_compare($GLOBALS['wp_version'], $api->requires, '<') ) echo '

' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '

'; foreach ( (array)$api->sections as $section_name => $content ) { $title = $section_name; @@ -549,11 +549,11 @@ function upload_plugin() { echo '
'; echo '

', sprintf( __('Installing Plugin from file: %s'), basename($filename) ), '

'; - //Handle a newly uploaded file, Else assume it was + //Handle a newly uploaded file, Else assume it was if ( !empty($_FILES) ) { $filename = wp_unique_filename( $uploads['basedir'], $filename ); $local_file = $uploads['basedir'] . '/' . $filename; - + // Move the file to the uploads dir if ( false === @ move_uploaded_file( $_FILES['pluginzip']['tmp_name'], $local_file) ) wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'])); @@ -578,7 +578,7 @@ function install_plugin() { check_admin_referer('install-plugin_' . $plugin); $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth. - + if ( is_wp_error($api) ) wp_die($api); @@ -660,7 +660,7 @@ function do_plugin_install_local_package($package, $filename = '') { show_message( __('No plugin Specified') ); return; } - + if ( empty($filename) ) $filename = basename($package); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index c43065e192..796c4c9007 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -553,7 +553,7 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio if ( empty($icon_url) ) $icon_url = 'images/generic.png'; - + $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); return $hookname; @@ -641,7 +641,7 @@ function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $fi /** * Add sub menu page to the tools main menu. * - * @param string $page_title + * @param string $page_title * @param unknown_type $menu_title * @param unknown_type $access_level * @param unknown_type $file diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 01efdf5aa3..1431f1ddc3 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1044,13 +1044,13 @@ function wp_create_post_autosave( $post_id ) { * * @package WordPress * @since 2.7 - * + * * @uses wp_write_post() * @uses edit_post() * @uses get_post() * @uses current_user_can() * @uses wp_create_post_autosave() - * + * * @return str URL to redirect to show the preview */ function post_preview() { @@ -1058,13 +1058,13 @@ function post_preview() { $post_ID = (int) $_POST['post_ID']; if ( $post_ID < 1 ) wp_die( __('Preview not available. Please save as a draft first.') ); - + if ( isset($_POST['catslist']) ) $_POST['post_category'] = explode(",", $_POST['catslist']); - + if ( isset($_POST['tags_input']) ) $_POST['tags_input'] = explode(",", $_POST['tags_input']); - + if ( $_POST['post_type'] == 'page' || empty($_POST['post_category']) ) unset($_POST['post_category']); @@ -1102,7 +1102,7 @@ function post_preview() { /** * Adds the TinyMCE editor used on the Write and Edit screens. - * + * * Has option to output a trimmed down version used in Press This. * * @package WordPress diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 6180f296f8..bde89e874b 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -301,7 +301,7 @@ function populate_options() { add_option('widget_rss', array()); add_option('update_core', array()); add_option('dismissed_update_core', array()); - + // Delete unused options $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins'); foreach ($unusedoptions as $option) : diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 499c8d9125..e3b9b48197 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -911,7 +911,7 @@ function register_column_headers($screen, $columns) { */ function get_hidden_columns($page) { $page = str_replace('.php', '', $page); - return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false ); + return (array) get_user_option( 'manage-' . $page . '-columns-hidden', 0, false ); } /** @@ -1000,7 +1000,7 @@ function inline_edit_row( $type ) { @@ -1335,7 +1335,7 @@ function _post_row($a_post, $pending_comments, $mode) { $m_time = $post->post_date; $time = get_post_time('G', true, $post); - $time_diff = time() - $time; + $time_diff = time() - $time; if ( ( 'future' == $post->post_status) ) { if ( $time_diff <= 0 ) { @@ -2316,7 +2316,7 @@ function _list_meta_row( $entry, &$count ) { $r .= "\n\t\t
"; $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false ); $r .= ""; - + $r .= "\n\t\t\n\t"; return $r; } @@ -2375,7 +2375,7 @@ function meta_form() { - + @@ -3038,7 +3038,7 @@ function find_posts_div($found_action = '') {
array(__('New Post'), 'edit_posts'), - 'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'), + 'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'), 'page-new.php' => array(__('New Page'), 'edit_pages'), 'media-new.php' => array(__('Upload'), 'upload_files'), 'edit-comments.php' => array(__('Comments'), 'moderate_comments') @@ -3325,10 +3325,10 @@ function screen_meta($screen) {
-
@@ -3367,7 +3367,7 @@ function screen_meta($screen) { if ( !isset($_wp_contextual_help['options-general']) ) $_wp_contextual_help['options-general'] = __('General Settings'); - $_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen); + $_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen); ?>