Changeset 15235
- Timestamp:
- 06/11/2010 08:19:35 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/css/ie-rtl.dev.css
r15218 r15235 148 148 float: none; 149 149 } 150 #nav-menus-frame .open-label span { 151 float: none; 152 display: inline-block; 153 } 154 #nav-menus-frame .delete-action { 155 float: none; 150 #nav-menus-frame .open-label span { 151 float: none; 152 display: inline-block; 156 153 } 154 #nav-menus-frame .delete-action { 155 float: none; 156 } -
trunk/wp-admin/includes/plugin.php
r15203 r15235 845 845 // No parent as top level 846 846 $_parent_pages[$menu_slug] = false; 847 847 848 848 return $hookname; 849 849 } … … 956 956 // No parent as top level 957 957 $_parent_pages[$menu_slug] = $parent_slug; 958 958 959 959 return $hookname; 960 960 } … … 1174 1174 /** 1175 1175 * Get the url to access a particular menu page based on the slug it was registered with. 1176 * 1176 * 1177 1177 * If the slug hasn't been registered properly no url will be returned 1178 * 1178 * 1179 1179 * @since 3.0 1180 * 1180 * 1181 1181 * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu) 1182 1182 * @param bool $echo Whether or not to echo the url - default is true … … 1185 1185 function menu_page_url($menu_slug, $echo = true) { 1186 1186 global $_parent_pages; 1187 1187 1188 1188 if ( isset( $_parent_pages[$menu_slug] ) ) { 1189 1189 if ( $_parent_pages[$menu_slug] ) { … … 1195 1195 $url = ''; 1196 1196 } 1197 1197 1198 1198 $url = esc_url($url); 1199 1199 1200 1200 if ( $echo ) 1201 1201 echo $url; 1202 1202 1203 1203 return $url; 1204 1204 } -
trunk/wp-admin/js/nav-menu.dev.js
r15214 r15235 699 699 * Will show and hide arrows where necessary. 700 700 * Scrolls to the active tab by default. 701 * 701 * 702 702 * @param savePosition {boolean} Optional. Prevents scrolling so 703 * that the current position is maintained. Default false. 703 * that the current position is maintained. Default false. 704 704 **/ 705 705 api.refreshMenuTabs = function( savePosition ) { -
trunk/wp-includes/nav-menu-template.php
r15221 r15235 267 267 $term_to_ancestor[ $desc ] = $anc; 268 268 } 269 269 270 270 foreach ( $terms as $desc ) { 271 271 do { … … 383 383 ( 384 384 'taxonomy' == $parent_item->type && 385 isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) && 385 isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) && 386 386 in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) 387 387 ) -
trunk/wp-includes/nav-menu.php
r15219 r15235 748 748 function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) { 749 749 // append new top-level page objects to a menu for which that option is selected 750 if ( 751 'publish' == $new_status && 752 'publish' != $old_status && 753 'page' == $post->post_type && 750 if ( 751 'publish' == $new_status && 752 'publish' != $old_status && 753 'page' == $post->post_type && 754 754 empty( $post->post_parent ) 755 755 ) { 756 756 $auto_add = get_option( 'nav_menu_options' ); 757 if ( 757 if ( 758 758 isset( $auto_add['auto_add'] ) && 759 is_array( $auto_add['auto_add'] ) 759 is_array( $auto_add['auto_add'] ) 760 760 ) { 761 761 $args = array( … … 777 777 } 778 778 } 779 } 780 779 } 780 781 781 // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published) 782 if ( 782 if ( 783 783 ! empty( $post->ID ) && 784 ( 784 ( 785 785 ( 'publish' == $old_status && 'draft' == $new_status ) || 786 ( 'draft' == $old_status && 'publish' == $new_status ) 786 ( 'draft' == $old_status && 'publish' == $new_status ) 787 787 ) 788 788 ) { -
trunk/wp-includes/theme.php
r15196 r15235 1548 1548 $repeat = 'repeat'; 1549 1549 $repeat = " background-repeat: $repeat;"; 1550 1550 1551 1551 $position = get_theme_mod( 'background_position_x', 'left' ); 1552 1552 if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) ) 1553 1553 $position = 'left'; 1554 1554 $position = " background-position: top $position;"; 1555 1555 1556 1556 $attachment = get_theme_mod( 'background_attachment', 'scroll' ); 1557 1557 if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) ) -
trunk/wp-includes/user.php
r15174 r15235 213 213 /** 214 214 * Get the current user's ID 215 * 215 * 216 216 * @since MU 217 * 217 * 218 218 * @uses wp_get_current_user 219 219 * -
trunk/wp-signup.php
r15217 r15235 177 177 $blogs = get_blogs_of_user($current_user->ID); 178 178 if ( !empty($blogs) ) { ?> 179 179 180 180 <p><?php _e( 'Sites you are already a member of:' ) ?></p> 181 181 <ul>
Note: See TracChangeset
for help on using the changeset viewer.