diff options
| author | Lester Caine <lester@lsces.co.uk> | 2010-04-25 15:25:10 +0000 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2010-04-25 15:25:10 +0000 |
| commit | 216374f1217330a712d64faf01dc01531c3f7695 (patch) | |
| tree | b3915d708c870c204f0f3729eb9feadde2787a42 | |
| parent | 815bd81c653ee66c29cd0c2bb644fab9d4727972 (diff) | |
| download | wiki-216374f1217330a712d64faf01dc01531c3f7695.tar.gz wiki-216374f1217330a712d64faf01dc01531c3f7695.tar.bz2 wiki-216374f1217330a712d64faf01dc01531c3f7695.zip | |
Move generation of stickyInfo so that it is created for books as well as pagesCVS_HEAD
| -rw-r--r-- | display_bitpage_inc.php | 12 | ||||
| -rw-r--r-- | lookup_page_inc.php | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/display_bitpage_inc.php b/display_bitpage_inc.php index c4da22b..e3706e5 100644 --- a/display_bitpage_inc.php +++ b/display_bitpage_inc.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_wiki/display_bitpage_inc.php,v 1.49 2010/04/24 08:11:22 lsces Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/display_bitpage_inc.php,v 1.50 2010/04/25 15:25:10 lsces Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See below for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details * - * $Id: display_bitpage_inc.php,v 1.49 2010/04/24 08:11:22 lsces Exp $ + * $Id: display_bitpage_inc.php,v 1.50 2010/04/25 15:25:10 lsces Exp $ * @package wiki * @subpackage functions */ @@ -150,6 +150,14 @@ if( $gBitSystem->isFeatureActive( 'users_watches' ) ) { } } +if( $gContent->isValid() && $gBitSystem->isPackageActive( 'stickies' ) ) { + require_once( STICKIES_PKG_PATH.'BitSticky.php' ); + global $gNote; + $gNote = new BitSticky( NULL, NULL, $gContent->mContentId ); + $gNote->load(); + $gBitSmarty->assign_by_ref( 'stickyInfo', $gNote->mInfo ); +} + // Display the Index Template $gBitSmarty->assign_by_ref( 'pageInfo', $gContent->mInfo ); diff --git a/lookup_page_inc.php b/lookup_page_inc.php index 5b241e6..2263813 100644 --- a/lookup_page_inc.php +++ b/lookup_page_inc.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_wiki/lookup_page_inc.php,v 1.30 2009/10/01 14:17:07 wjames5 Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/lookup_page_inc.php,v 1.31 2010/04/25 15:25:10 lsces Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See below for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details * - * $Id: lookup_page_inc.php,v 1.30 2009/10/01 14:17:07 wjames5 Exp $ + * $Id: lookup_page_inc.php,v 1.31 2010/04/25 15:25:10 lsces Exp $ * @package wiki * @subpackage functions */ @@ -85,14 +85,6 @@ if( empty( $gStructure ) ) { } } -if( $gContent->isValid() && $gBitSystem->isPackageActive( 'stickies' ) ) { - require_once( STICKIES_PKG_PATH.'BitSticky.php' ); - global $gNote; - $gNote = new BitSticky( NULL, NULL, $gContent->mContentId ); - $gNote->load(); - $gBitSmarty->assign_by_ref( 'stickyInfo', $gNote->mInfo ); -} - $gBitSmarty->clear_assign( 'gContent' ); $gBitSmarty->assign_by_ref( 'gContent', $gContent ); ?> |