Changeset 17435
- Timestamp:
- 02/09/2011 05:35:36 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/css/wp-admin.dev.css
r17368 r17435 3576 3576 ------------------------------------------------------------------------------*/ 3577 3577 3578 .theme-install-php .tablenav { 3579 height:auto; 3580 } 3578 .theme-install-php .tablenav { 3579 height:auto; 3580 } 3581 3581 3582 3582 table#availablethemes { … … 3588 3588 } 3589 3589 3590 table#availablethemes .no-items td{ 3591 border-width:0; 3592 padding:5px; 3593 } 3590 table#availablethemes .no-items td{ 3591 border-width:0; 3592 padding:5px; 3593 } 3594 3594 3595 3595 td.available-theme { -
trunk/wp-admin/edit-tags.php
r17366 r17435 155 155 if ( ! empty( $_REQUEST['paged'] ) ) 156 156 $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); 157 157 158 158 wp_redirect( $location ); 159 159 exit; -
trunk/wp-admin/includes/class-wp-list-table.php
r17369 r17435 199 199 if ( ! empty( $_REQUEST['orderby'] ) ) 200 200 echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />'; 201 if ( ! empty( $_REQUEST['order'] ) ) 201 if ( ! empty( $_REQUEST['order'] ) ) 202 202 echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />'; 203 203 ?> … … 483 483 484 484 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 485 485 486 486 $current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url ); 487 487 -
trunk/wp-admin/includes/class-wp-plugin-install-list-table.php
r17322 r17435 153 153 'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array() 154 154 ); 155 155 156 156 list( $columns, $hidden ) = $this->get_column_info(); 157 157 -
trunk/wp-admin/includes/class-wp-themes-list-table.php
r17322 r17435 67 67 return; 68 68 } 69 69 70 70 if ( is_multisite() ) { 71 71 if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) { … … 89 89 printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) ); 90 90 } 91 92 function tablenav( $which = 'top' ) { 91 92 function tablenav( $which = 'top' ) { 93 93 if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) 94 94 return; 95 ?> 96 <div class="tablenav <?php echo $which; ?>"> 97 <?php $this->pagination( $which ); ?> 98 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" /> 99 <br class="clear" /> 100 </div> 101 <?php 95 ?> 96 <div class="tablenav <?php echo $which; ?>"> 97 <?php $this->pagination( $which ); ?> 98 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" /> 99 <br class="clear" /> 100 </div> 101 <?php 102 102 } 103 103 … … 105 105 // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); 106 106 ?> 107 <?php $this->tablenav( 'top' ); ?> 107 <?php $this->tablenav( 'top' ); ?> 108 108 109 109 <table id="availablethemes" cellspacing="0" cellpadding="0"> … … 113 113 </table> 114 114 115 <?php $this->tablenav( 'bottom' ); ?> 115 <?php $this->tablenav( 'bottom' ); ?> 116 116 <?php 117 117 } -
trunk/wp-admin/js/edit-comments.dev.js
r17354 r17435 219 219 // var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r; 220 220 var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r; 221 221 222 222 if (! args.paged) 223 223 args.paged = 1; 224 224 225 225 if (args.paged > total_pages) { 226 226 return; -
trunk/wp-admin/js/list-table.dev.js
r17321 r17435 30 30 var options = $('option', this), 31 31 anySelected = false; 32 32 33 33 options.each( function(){ 34 34 this.selected = this.defaultSelected; 35 35 anySelected = anySelected || this.defaultSelected; 36 36 }); 37 37 38 38 // If no options are selected within a single-select dropdown, 39 39 // select the first element by default. -
trunk/wp-includes/admin-bar.php
r17329 r17435 146 146 if ( empty( $short ) ) 147 147 return; 148 148 149 149 $html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />'; 150 150 151 151 $wp_admin_bar->add_menu( array( 152 152 'id' => $id, -
trunk/wp-includes/class-pop3.php
r17312 r17435 13 13 * Licensed under the GNU GPL. For full terms see the file COPYING. 14 14 * @license http://opensource.org/licenses/gpl-license.php GNU General Public License 15 * 15 * 16 16 * pop3 class 17 17 * -
trunk/wp-includes/class-wp-admin-bar.php
r17279 r17435 116 116 <?php 117 117 $is_parent = ! empty( $menu_item['children'] ); 118 118 119 119 $menuclass = $is_parent ? 'menupop' : ''; 120 120 if ( ! empty( $menu_item['meta']['class'] ) ) -
trunk/wp-includes/functions.php
r17427 r17435 3073 3073 foreach ( $list as $key => $obj ) { 3074 3074 $matched = count( array_intersect_assoc( (array) $obj, $args ) ); 3075 if ( ( 'AND' == $operator && $matched == $count ) 3075 if ( ( 'AND' == $operator && $matched == $count ) 3076 3076 || ( 'OR' == $operator && $matched <= $count ) 3077 3077 || ( 'NOT' == $operator && 0 == $matched ) ) { -
trunk/wp-includes/js/admin-bar.dev.js
r17279 r17435 54 54 i = q.length; 55 55 while ( i-- ) { 56 inA = false; 56 inA = false; 57 57 ancestorLength = ancestors.length; 58 58 while( ancestorLength-- ) { 59 if ( ancestors[ ancestorLength ] == q[i][1] ) 60 inA = true; 59 if ( ancestors[ ancestorLength ] == q[i][1] ) 60 inA = true; 61 61 } 62 62 -
trunk/wp-includes/query.php
r17358 r17435 1720 1720 'terms' => $q['category__not_in'], 1721 1721 'operator' => 'NOT IN', 1722 'include_children' => false 1722 'include_children' => false 1723 1723 ); 1724 1724 } -
trunk/wp-includes/user.php
r17361 r17435 543 543 function query() { 544 544 global $wpdb; 545 545 546 546 if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) { 547 547 $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); … … 549 549 $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); 550 550 } 551 551 552 552 if ( $this->query_vars['count_total'] ) 553 553 $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");
Note: See TracChangeset
for help on using the changeset viewer.