WordPress.org

Plugin Directory

Changeset 646162


Ignore:
Timestamp:
12/30/12 20:29:27 (16 months ago)
Author:
scribu
Message:

deploy from git

Location:
posts-to-posts/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • posts-to-posts/trunk/admin/column.php

    r633463 r646162  
    2323        $this->prepare_items(); 
    2424 
    25         $columns[ $this->column_id ] = $this->ctype->get( 'current', 'title' ); 
     25        $labels = $this->ctype->get( 'current', 'labels' ); 
     26 
     27        $title = isset( $labels->column_title ) 
     28            ? $labels->column_title 
     29            : $labels->title; 
     30 
     31        $columns[ $this->column_id ] = $title; 
    2632 
    2733        return $columns; 
  • posts-to-posts/trunk/command.php

    r629249 r646162  
    3131        if ( isset( $assoc_args['items'] ) ) { 
    3232            foreach ( _p2p_extract_post_types( $ctype->side ) as $ptype ) { 
    33                 $command = array( 'wp', 'post', 'generate' ); 
    3433                $assoc_args = array( 'post_type' => $ptype ); 
    3534 
    36                 WP_CLI::launch( WP_CLI::compose_args( $command, $assoc_args ) ); 
     35                WP_CLI::launch( 'wp post generate' . \WP_CLI\Utils\compose_assoc_args( $assoc_args ) ); 
    3736            } 
    3837        } 
  • posts-to-posts/trunk/core/side.php

    r629142 r646162  
    259259 
    260260        if ( isset( $qv['p2p:page'] ) && $qv['p2p:page'] > 0 ) { 
    261             $qv['number'] = $qv['p2p:per_page']; 
    262             $qv['offset'] = $qv['p2p:per_page'] * ( $qv['p2p:page'] - 1 ); 
     261            if ( isset( $qv['p2p:per_page'] ) && $qv['p2p:per_page'] > 0 ) { 
     262                $qv['number'] = $qv['p2p:per_page']; 
     263                $qv['offset'] = $qv['p2p:per_page'] * ( $qv['p2p:page'] - 1 ); 
     264            } 
    263265        } 
    264266 
Note: See TracChangeset for help on using the changeset viewer.