diff options
| -rw-r--r-- | admin/schema_inc.php | 15 | ||||
| -rw-r--r-- | wiki_rss.php | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index c5c1dd7..ad84fec 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -139,16 +139,16 @@ $gBitInstaller->registerPreferences( WIKI_PKG_NAME, array( array( WIKI_PKG_NAME, 'wiki_words','y'), //array( WIKI_PKG_NAME, 'wiki_min_versions','1'), //array( WIKI_PKG_NAME, 'wiki_max_versions','0'), - array( WIKI_PKG_NAME, 'wiki_attachments_use_db','y'), + //array( WIKI_PKG_NAME, 'wiki_attachments_use_db','y'), //array( WIKI_PKG_NAME, 'wiki_attachments_use_dir',''), array( WIKI_PKG_NAME, 'wiki_warn_on_edit_time','2'), //array( WIKI_PKG_NAME, 'wiki_bot_bar','n'), - array( WIKI_PKG_NAME, 'wiki_cache','0'), + //array( WIKI_PKG_NAME, 'wiki_cache','0'), //array( WIKI_PKG_NAME, 'wiki_creator_admin','n'), //array( WIKI_PKG_NAME, 'wiki_copyrights','n'), //array( WIKI_PKG_NAME, 'wiki_forum',''), //array( WIKI_PKG_NAME, 'wiki_forum_id',''), - array( WIKI_PKG_NAME, 'wiki_left_column','y'), + //array( WIKI_PKG_NAME, 'wiki_left_column','y'), array( WIKI_PKG_NAME, 'wiki_list_backlinks','y'), array( WIKI_PKG_NAME, 'wiki_list_comment','y'), array( WIKI_PKG_NAME, 'wiki_list_creator','y'), @@ -162,7 +162,7 @@ $gBitInstaller->registerPreferences( WIKI_PKG_NAME, array( array( WIKI_PKG_NAME, 'wiki_list_user','y'), array( WIKI_PKG_NAME, 'wiki_list_versions','y'), array( WIKI_PKG_NAME, 'wiki_page_regex','strict'), - array( WIKI_PKG_NAME, 'wiki_right_column','y'), + //array( WIKI_PKG_NAME, 'wiki_right_column','y'), //array( WIKI_PKG_NAME, 'wiki_top_bar','n'), //array( WIKI_PKG_NAME, 'wiki_uses_slides','n'), array( WIKI_PKG_NAME, 'wiki_book_show_path','y'), @@ -172,10 +172,9 @@ $gBitInstaller->registerPreferences( WIKI_PKG_NAME, array( //array( WIKI_PKG_NAME, 'wiki_submit_notice',''), ) ); -if( defined( 'RSS_PKG_NAME' ) ) { +if( defined( 'RSS_PKG_NAME' )) { $gBitInstaller->registerPreferences( WIKI_PKG_NAME, array( - array( RSS_PKG_NAME, 'rss_'.WIKI_PKG_NAME, 'y'), - ) ); + array( RSS_PKG_NAME, WIKI_PKG_NAME.'_rss', 'y'), + )); } - ?> diff --git a/wiki_rss.php b/wiki_rss.php index 3e8daa3..7f8ae00 100644 --- a/wiki_rss.php +++ b/wiki_rss.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.14 2007/01/01 12:53:27 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.15 2007/01/07 10:48:33 squareing Exp $ * @package wiki * @subpackage functions */ @@ -26,7 +26,7 @@ if( !$gBitUser->hasPermission( 'p_wiki_view_page' ) ) { } else { // check if we want to use the cache file $cacheFile = TEMP_PKG_PATH.RSS_PKG_NAME.'/'.WIKI_PKG_NAME.'_'.$rss_version_name.'.xml'; - $rss->useCached( $rss_version_name, $cacheFile ); // use cached version if age < 1 hour + $rss->useCached( $rss_version_name, $cacheFile, $gBitSystem->getConfig( 'rssfeed_cache_time' )); $wiki = new BitPage(); $feeds = $wiki->getList( 0, $gBitSystem->getConfig( 'wiki_rss_max_records', 10 ), 'last_modified_desc', NULL, NULL, FALSE, FALSE, TRUE ); |