diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 31c9de60d3..44be50a869 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -249,7 +249,7 @@ case 'unapprovecomment' : wp_set_comment_status( $comment_id, 'hold' ); $redir = add_query_arg( array( 'unapproved' => 1 ), $redir ); break; - } + } wp_redirect( $redir ); die; diff --git a/wp-admin/css/custom-navigation.dev.css b/wp-admin/css/custom-navigation.dev.css index 9f2060cf4c..1510e8a0fe 100644 --- a/wp-admin/css/custom-navigation.dev.css +++ b/wp-admin/css/custom-navigation.dev.css @@ -8,7 +8,7 @@ * @package WordPress * @subpackage Administration */ - + .fix{clear: both;height: 1px;margin: -1px 0 0;overflow: hidden;} #no-js {display:block;} diff --git a/wp-admin/custom-navigation.php b/wp-admin/custom-navigation.php index 361d500663..93f1577cf8 100644 --- a/wp-admin/custom-navigation.php +++ b/wp-admin/custom-navigation.php @@ -9,7 +9,7 @@ * @package WordPress * @subpackage Administration */ - + require_once('admin.php'); wp_admin_css( 'custom-navigation' ); @@ -28,9 +28,9 @@ wp_custom_navigation(); function wp_custom_nav_reset() { wp_custom_navigation_setup(true); - + return true; - + } @@ -46,20 +46,20 @@ function wp_custom_navigation() {

You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.

- + false ) ); if ( !empty( $custom_menus ) ) @@ -74,12 +74,12 @@ function wp_custom_navigation() { } } } - + if ( isset( $_POST['set_wp_menu'] ) ) { update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] ); $messagesdiv = '

'.$themename.'s Custom Menu has been updated!

'; - } - + } + if ( isset( $_POST['licount'] ) ) $postCounter = $_POST['licount']; else @@ -93,13 +93,13 @@ function wp_custom_navigation() { $existing_term = get_term_by( 'name', $insert_menu_name, 'menu' ); if ( $existing_term ) { $messagesdiv = '

'.$insert_menu_name.' Menu has already created - please try another name

'; - } else { + } else { $term = wp_insert_term( $insert_menu_name, 'menu' ); if ( $term ) { $custom_menus[$term['term_id']] = $term; $menu_selected_id = $term['term_id']; $menu_id_in_edit = $menu_selected_id; - $messagesdiv = '

'.$insert_menu_name.' Menu has been created!

'; + $messagesdiv = '

'.$insert_menu_name.' Menu has been created!

'; $postCounter = 0; } @@ -108,8 +108,8 @@ function wp_custom_navigation() { $messagesdiv = '

Please enter a valid Menu name

'; } } - - if ( isset($_POST['reset_wp_menu']) ) { + + if ( isset($_POST['reset_wp_menu']) ) { $success = wp_custom_nav_reset(); if ($success) { // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly @@ -128,7 +128,7 @@ function wp_custom_navigation() { $update_fields = array( 'menu_order', 'guid', 'post_content', 'post_title', 'post_excerpt', 'post_content_filtered' ); //Loop through all POST variables for ($k = 1;$k<= $postCounter; $k++) { - + if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; } if (isset($_POST['postmenu'.$k])) { $post_id = $_POST['postmenu'.$k]; } else { $post_id = 0; } //@todo implement heirarchy @@ -142,7 +142,7 @@ function wp_custom_navigation() { if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; } if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = stripslashes($_POST['anchortitle'.$k]); } else { $custom_anchor_title = $custom_title; } if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; } - + $post = array( 'post_status' => 'publish', 'post_type' => 'menu_item', 'post_author' => $user_ID, 'ping_status' => 0, 'post_parent' => $post_id, '`menu_order' => $position, 'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'menu' => $menu_title ), @@ -175,43 +175,43 @@ function wp_custom_navigation() { //DISPLAY SUCCESS MESSAGE IF POST CORRECT $messagesdiv = '

'.$themename.'s Custom Menu has been updated!

'; } - + //DISPLAY Custom Navigation ?>

Custom Navigation

The Custom Menu has not been Enabled yet. Please enable it in order to use it -------->

'; } - - + + ?>
- + - +
- +

- +
- + - +

- + - +

- + -
+
Display Descriptions in Top Level Menu? - + 0) { $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions'); @@ -335,16 +335,16 @@ function wp_custom_navigation() { else { $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions'); } - + $checked = strtolower($checkedraw); - + if ($advanced_option_descriptions == 'no') { $checked = 'no'; } - + ?> - + /> /> @@ -353,16 +353,16 @@ function wp_custom_navigation() {
- +

Add an Existing Page

- + 0, 'sort_order' => 'ASC', @@ -377,8 +377,8 @@ function wp_custom_navigation() { 'exclude_tree' => '', 'number' => '', 'offset' => 0 ); - - //GET all pages + + //GET all pages $pages_array = get_pages($pages_args); $page_name = ''; //CHECK if pages exist @@ -386,7 +386,7 @@ function wp_custom_navigation() { { foreach ($pages_array as $post) { - //Add page name to + //Add page name to $page_name .= htmlentities($post->post_title).'|'; } } @@ -394,43 +394,43 @@ function wp_custom_navigation() { { $page_name = "No pages available"; } - + ?> - + - - - View All + + + View All Hide All - + - + - +
- +
- +

Add an Existing Category

- + get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC"); $cat_name = ''; //CHECK for results if ($categories) { - foreach($categories as $category) - { + foreach($categories as $category) + { $cat_id = $category->term_id; - + $cat_args=array( 'orderby' => 'name', 'include' => $cat_id, 'hierarchical' => 1, 'order' => 'ASC' ); - + $category_names=get_categories($cat_args); - + if (isset($category_names[0]->name)) { //Add category name to data string @@ -483,7 +483,7 @@ function wp_custom_navigation() { { $cat_name = "No categories available"; } - + ?> - - - View All + + + View All Hide All - + - + - +
- +
- +
@@ -551,16 +551,16 @@ function wp_custom_navigation() {
- + - + - +


diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 90b29ac7e6..a67fc12a6c 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -224,7 +224,7 @@ if ( empty($tags_per_page) || $tags_per_page < 1 ) if ( 'post_tag' == $taxonomy ) { $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page ); $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter -} elseif ( 'category' == $taxonomy ) { +} elseif ( 'category' == $taxonomy ) { $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter } else { $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page ); @@ -304,10 +304,10 @@ if ( $page_links ) -
-

Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?>

-

category to tag converter.'), 'admin.php?import=wp-cat2tag') ?>

-
+
+

Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?>

+

category to tag converter.'), 'admin.php?import=wp-cat2tag') ?>

+
diff --git a/wp-admin/js/custom-navigation-default-items.dev.js b/wp-admin/js/custom-navigation-default-items.dev.js index 22cc44ea35..dd9c00c5cf 100644 --- a/wp-admin/js/custom-navigation-default-items.dev.js +++ b/wp-admin/js/custom-navigation-default-items.dev.js @@ -8,7 +8,7 @@ * @package WordPress * @subpackage Administration */ - + /* * Init Functions */ @@ -23,37 +23,37 @@ jQuery(function($) modal: true, buttons: { 'Save': function() { - + titletosave = $('#edittitle').attr('value'); linktosave = $('#editlink').attr('value'); anchortitletosave = $('#editanchortitle').attr('value'); newwindowtosave = $('#editnewwindow').attr('value'); desctosave = $('#editdescription').attr('value'); - + $('#title' + $(this).dialog('option', 'itemID')).attr('value',titletosave); $('#linkurl' + $(this).dialog('option', 'itemID')).attr('value',linktosave); $('#anchortitle' + $(this).dialog('option', 'itemID')).attr('value',anchortitletosave); $('#newwindow' + $(this).dialog('option', 'itemID')).attr('value',newwindowtosave); $('#description' + $(this).dialog('option', 'itemID')).attr('value',desctosave); - + $('#menu-' + $(this).dialog('option', 'itemID') + ' > dl > dt > span.title').text(titletosave); - + $('#view' + + $(this).dialog('option', 'itemID')).attr('href', linktosave); - + $(this).dialog('close'); - + }, Cancel: function() { $(this).dialog('close'); } } }); - + $('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ $(this).remove();}); - + //Add dropzone - $('#custom-nav li').prepend('
'); - + $('#custom-nav li').prepend('
'); + //Make li items draggable $('#custom-nav li').draggable({ handle: ' > dl', @@ -68,70 +68,70 @@ jQuery(function($) { accept: '#custom-nav li', tolerance: 'pointer', - drop: function(e, ui) + drop: function(e, ui) { var li = $(this).parent(); var child = !$(this).hasClass('dropzone'); //Add UL to first child - if (child && li.children('ul').length == 0) + if (child && li.children('ul').length == 0) { li.append('