diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:29:26 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:29:26 +0000 |
| commit | 426e1a17345ff8c8621ef0e137ec1687c2758eda (patch) | |
| tree | 52af755ba971014d981a9c141e870c31d63e115c | |
| parent | cba52a666bb221c21f622600af12252305b69320 (diff) | |
| download | wiki-426e1a17345ff8c8621ef0e137ec1687c2758eda.tar.gz wiki-426e1a17345ff8c8621ef0e137ec1687c2758eda.tar.bz2 wiki-426e1a17345ff8c8621ef0e137ec1687c2758eda.zip | |
merge recent changes into HEAD
| -rw-r--r-- | templates/page_date_bar.tpl | 2 | ||||
| -rw-r--r-- | wiki_rss.php | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/templates/page_date_bar.tpl b/templates/page_date_bar.tpl index dacdb63..0375418 100644 --- a/templates/page_date_bar.tpl +++ b/templates/page_date_bar.tpl @@ -1,5 +1,5 @@ {if !$gBitSystem->isFeatureActive( 'hide_wiki_date' )} <div class="date"> - {tr}Created by {displayname user=$pageInfo.creator_user user_id=$pageInfo.creator_user_id real_name=$pageInfo.creator_real_name}, Last modification by {displayname user=$pageInfo.modifier_user user_id=$pageInfo.modifier_user_id real_name=$pageInfo.modifier_real_name} on {$pageInfo.last_modified|bit_short_datetime}{/tr} + {tr}By{/tr} {displayname user=$pageInfo.creator_user user_id=$pageInfo.user_id real_name=$pageInfo.creator_real_name}, {tr}Last modification on{/tr} {$pageInfo.last_modified|bit_short_datetime} {if $pageInfo.modifier_user_id!=$pageInfo.user_id} {tr}by{/tr} {displayname user=$pageInfo.modifier_user user_id=$pageInfo.modifier_user_id real_name=$pageInfo.modifier_real_name}{/if} </div> {/if} diff --git a/wiki_rss.php b/wiki_rss.php index fbedda4..128545f 100644 --- a/wiki_rss.php +++ b/wiki_rss.php @@ -1,4 +1,13 @@ <?php +/** + * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.4 2005/11/22 07:29:25 squareing Exp $ + * @package wiki + * @subpackage functions + */ + +/** + * Initialization + */ require_once( "../bit_setup_inc.php" ); require_once( RSS_PKG_PATH."rss_inc.php" ); require_once( WIKI_PKG_PATH."BitPage.php" ); |