WordPress.org

Plugin Directory

Changeset 626103


Ignore:
Timestamp:
11/16/12 12:26:07 (17 months ago)
Author:
boonebgorges
Message:

Merge for 1.2.x

Location:
buddypress-docs/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • buddypress-docs/trunk/bp-docs.php

    r625943 r626103  
    535535        $registered_rules = get_option( 'rewrite_rules' ); 
    536536 
    537         if ( ! in_array( $test_rule, $registered_rules ) ) { 
     537        if ( is_array( $registered_rules ) && ! in_array( $test_rule, $registered_rules ) ) { 
    538538            flush_rewrite_rules(); 
    539539        } 
  • buddypress-docs/trunk/includes/templatetags.php

    r625943 r626103  
    12071207} 
    12081208 
     1209/** 
     1210 * Echoes the Create A Doc button 
     1211 * 
     1212 * @since 1.2 
     1213 */ 
    12091214function bp_docs_create_button() { 
    12101215    if ( ! bp_docs_is_doc_create() && bp_docs_current_user_can( 'create' ) ) { 
     
    12121217    } 
    12131218} 
    1214 add_action( 'bp_member_plugin_options_nav', 'bp_docs_create_button' ); 
     1219 
     1220/** 
     1221 * Puts a Create A Doc button on the members nav of member doc lists 
     1222 * 
     1223 * @since 1.2.1 
     1224 */ 
     1225function bp_docs_member_create_button() { 
     1226    if ( bp_docs_is_docs_component() ) { 
     1227        bp_docs_create_button(); 
     1228    } 
     1229} 
     1230add_action( 'bp_member_plugin_options_nav', 'bp_docs_member_create_button' ); 
    12151231 
    12161232/** 
  • buddypress-docs/trunk/includes/upgrade.php

    r625951 r626103  
    3737 
    3838    if ( ! empty( $_GET['bp_docs_upgraded'] ) ) { 
     39        flush_rewrite_rules(); // just in case. Hack 
    3940        echo '<div class="updated message"><p>' . __( 'Upgrade complete!', 'bp-docs' ) . '</p></div>'; 
    4041    } 
  • buddypress-docs/trunk/loader.php

    r625943 r626103  
    44Plugin URI: http://github.com/boonebgorges/buddypress-docs 
    55Description: Adds collaborative Docs to BuddyPress 
    6 Version: 1.2 
     6Version: 1.2.1 
    77Author: Boone B Gorges 
    88Author URI: http://boone.gorg.es 
     
    1414*/ 
    1515 
    16 define( 'BP_DOCS_VERSION', '1.2' ); 
     16define( 'BP_DOCS_VERSION', '1.2.1' ); 
    1717 
    1818// BuddyPress Docs introduces a lot of overhead. Unless otherwise specified, 
  • buddypress-docs/trunk/readme.txt

    r625951 r626103  
    55Requires at least: WordPress 3.3, BuddyPress 1.5 
    66Tested up to: WordPress 3.5, BuddyPress 1.6.1 
    7 Stable tag: 1.2 
     7Stable tag: 1.2.1 
    88  
    99Adds collaborative Docs to BuddyPress. 
     
    3535 
    3636== Changelog == 
     37 
     38= 1.2.1 = 
     39* Fixes bug with overzealous Create New Doc button 
     40* Fixes some PHP warnings 
    3741 
    3842= 1.2 = 
Note: See TracChangeset for help on using the changeset viewer.