diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:19:20 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:19:20 +0000 |
| commit | ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc (patch) | |
| tree | 760ed8925d6bbed30eca9069904fcef6a722124e /lookup_page_inc.php | |
| parent | e142f1af7040016c0d076ba7b7d659b8ec2485f3 (diff) | |
| download | wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.tar.gz wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.tar.bz2 wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.zip | |
merge recent changes into HEAD
Diffstat (limited to 'lookup_page_inc.php')
| -rw-r--r-- | lookup_page_inc.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lookup_page_inc.php b/lookup_page_inc.php index b97cc4d..532f896 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.5 2005/12/26 12:27:43 squareing Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/lookup_page_inc.php,v 1.6 2006/01/10 21:19:20 squareing Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: lookup_page_inc.php,v 1.5 2005/12/26 12:27:43 squareing Exp $ + * $Id: lookup_page_inc.php,v 1.6 2006/01/10 21:19:20 squareing Exp $ * @package wiki * @subpackage functions */ @@ -22,7 +22,7 @@ include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' ); // if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up. - if( empty( $gContent ) || !is_object( $gContent ) ) { +// if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) { $gContent = new BitPage( @BitBase::verifyId( $_REQUEST['page_id'] ) ? $_REQUEST['page_id'] : NULL, @BitBase::verifyId( $_REQUEST['content_id'] ) ? $_REQUEST['content_id'] : NULL ); $loadPage = (!empty( $_REQUEST['page'] ) ? $_REQUEST['page'] : NULL); @@ -46,9 +46,7 @@ if( !$gContent->load() && $loadPage ) { $gContent->mInfo['title'] = $loadPage; } - $gBitSmarty->assign_by_ref( 'gContent', $gContent ); - $gBitSmarty->assign_by_ref( 'pageInfo', $gContent->mInfo ); - } +// } // we weren't passed a structure, but maybe this page belongs to one. let's check... if( empty( $gStructure ) ) { @@ -132,5 +130,8 @@ $beingedited = 'n'; } $gBitSmarty->assign('beingEdited', $beingedited); - } + } + $gBitSmarty->clear_assign( 'gContent' ); + $gBitSmarty->assign( 'gContent', $gContent ); + $gBitSmarty->assign_by_ref( 'pageInfo', $gContent->mInfo ); ?> |