diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:14 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:14 +0000 |
| commit | 5b7c89324afedc0307e674fe4a852f5d08648654 (patch) | |
| tree | 4e1053e37f51470513a5da973646530fd04f6772 | |
| parent | 59e7841664ad33e76b32fba63a3a4f206ec6b144 (diff) | |
| download | rss-5b7c89324afedc0307e674fe4a852f5d08648654.tar.gz rss-5b7c89324afedc0307e674fe4a852f5d08648654.tar.bz2 rss-5b7c89324afedc0307e674fe4a852f5d08648654.zip | |
Merge recent changes from R1 to HEAD - never doing this again.
| -rw-r--r-- | admin/schema_inc.php | 2 | ||||
| -rw-r--r-- | templates/admin_rss.tpl | 2 | ||||
| -rw-r--r-- | templates/header_inc.tpl | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index c102bca..2f1a91e 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -27,7 +27,7 @@ $tables = array( global $gBitInstaller; foreach( array_keys( $tables ) AS $tableName ) { - $gBitInstaller->registerSchemaTable( RSS_PKG_DIR, $tableName, $tables[$tableName] ); + $gBitInstaller->registerSchemaTable( RSS_PKG_NAME, $tableName, $tables[$tableName] ); } $gBitInstaller->registerPackageInfo( RSS_PKG_NAME, array( diff --git a/templates/admin_rss.tpl b/templates/admin_rss.tpl index 526bf2c..5ade60f 100644 --- a/templates/admin_rss.tpl +++ b/templates/admin_rss.tpl @@ -68,7 +68,7 @@ <div class="row"> {formlabel label="Append CSS file" for="rssfeed_css"} {forminput} - <input type="checkbox" name="rssfeed_css" id="rssfeed_css" value="y" {if $gBitSystemPrefs.rssfeed_css eq 'y'}checked="checked"{/if} /> + <input type="checkbox" name="rssfeed_css" id="rssfeed_css" value="y" {if $gBitSystem->isFeatureActive( 'rssfeed_css' )}checked="checked"{/if} /> {formhelp note=""} {/forminput} </div> diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl new file mode 100644 index 0000000..8b24190 --- /dev/null +++ b/templates/header_inc.tpl @@ -0,0 +1,11 @@ +{* $Header: /cvsroot/bitweaver/_bit_rss/templates/header_inc.tpl,v 1.2 2005/07/17 17:36:14 squareing Exp $ *} +{strip} +{if $gBitSystem->isPackageActive( 'rss' )} + {if $gBitLoc.ACTIVE_PACKAGE eq 'blogs' and $gBitUser->hasPermission( 'bit_p_read_blog' )} + <link rel="alternate" type="application/rss+xml" title="{$title}{$post_info.blogtitle}" href="{$gBitLoc.BLOGS_PKG_URL}blogs_rss.php?blog_id={$blog_id}" /> + {/if} + {if $gBitLoc.ACTIVE_PACKAGE eq 'wiki' and $gBitUser->hasPermission( 'bit_p_view' )} + <link rel="alternate" type="application/rss+xml" title="{$siteTitle} - wiki" href="{$gBitLoc.RSS_PKG_URL}wiki_rss.php" /> + {/if} +{/if} +{/strip} |