WordPress.org
Get WordPress

Plugin Directory

Changeset 370958


Ignore:
Timestamp:
04/09/2011 04:52:54 PM (15 years ago)
Author:
beatpanda
Message:

Merge branch 'master' of ​https://github.com/acustica/WordPress-Wiki into acustica-master

Location:
wordpress-wiki/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • wordpress-wiki/trunk/controllers/wiki_feed.php

    r334363 r370958  
    1111        }
    1212   
    13         global $wp_rewrite;
    1413        add_feed('wiki', array($this,'create_feed'));
    1514        add_action('generate_rewrite_rules', array($this,'feed_rewrite_rules'));
    16         $wp_rewrite->flush_rules();
    1715    }
    1816   

  • wordpress-wiki/trunk/wordpress-wiki.php

    r370950 r370958  
    4646        include(WPWIKI_FILE_PATH.'/lib/wpw_wikiparser.php');
    4747       
     48        //Flush rewrite rules on activation to enable siteurl.com/wiki feed url. Can't use activation hook b/c it comes too late (after init)
     49        if ( is_admin() && $_GET['activate'] && $_SERVER['SCRIPT_NAME'] == '/wp-admin/plugins.php' )
     50            add_action( 'init', 'flush_rewrite_rules', 12 );
    4851       
    4952       
Note: See TracChangeset for help on using the changeset viewer.