diff options
| -rw-r--r-- | admin/upgrade_inc.php | 2 | ||||
| -rw-r--r-- | page_history.php | 7 | ||||
| -rw-r--r-- | templates/page_history.tpl | 4 | ||||
| -rw-r--r-- | templates/rollback.tpl | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 1fcc23f..bba44e1 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -194,6 +194,7 @@ array( 'QUERY' => "INSERT INTO `".BIT_DB_PREFIX."tiki_preferences` (`name`, `value`, `package`) VALUES( 'feature_wiki_books', 'y', 'wiki' )", "INSERT INTO `".BIT_DB_PREFIX."tiki_preferences` (`name`, `value`, `package`) VALUES( 'feature_history', 'y', 'wiki' )", "INSERT INTO `".BIT_DB_PREFIX."tiki_preferences` (`name`, `value`, `package`) VALUES( 'feature_listPages', 'y', 'wiki' )", + "UPDATE `".BIT_DB_PREFIX."tiki_preferences` SET name='allow_html' WHERE name='feature_wiki_allowhtml', "UPDATE `".BIT_DB_PREFIX."tiki_categorized_objects` SET `object_type`='".BITPAGE_CONTENT_TYPE_GUID."', `object_id`=(SELECT tc.`content_id` FROM `".BIT_DB_PREFIX."tiki_content` tc WHERE tc.`title`=`".BIT_DB_PREFIX."tiki_categorized_objects`.`objId` AND `".BIT_DB_PREFIX."tiki_categorized_objects`.`object_type`='wiki page')", @@ -299,6 +300,7 @@ array('QUERY' => array( 'SQL92' => array( "INSERT INTO `".BIT_DB_PREFIX."users_permissions` (`perm_name`,`perm_desc`, `perm_level`, `package`) VALUES ('p_wiki_view_history', 'Can view page history', 'basic', 'wiki')", "INSERT INTO `".BIT_DB_PREFIX."users_group_permissions` (`group_id`, `perm_name`) VALUES (-1,'p_wiki_view_history')", + "UPDATE `".BIT_DB_PREFIX."kernel_config` SET config_name='content_allow_html' WHERE config_name='allow_html', ), )), ) diff --git a/page_history.php b/page_history.php index 9cc595f..344b3e0 100644 --- a/page_history.php +++ b/page_history.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.14 2006/05/12 20:33:25 sylvieg Exp $ + * $Header: /cvsroot/bitweaver/_bit_wiki/page_history.php,v 1.15 2006/11/02 16:12:50 spiderr 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: page_history.php,v 1.14 2006/05/12 20:33:25 sylvieg Exp $ + * $Id: page_history.php,v 1.15 2006/11/02 16:12:50 spiderr Exp $ * @package wiki * @subpackage functions */ @@ -52,7 +52,8 @@ if (isset($_REQUEST["delete"]) && isset($_REQUEST["hist"])) { } } elseif (isset($_REQUEST["preview"])) { if( $version = $gContent->getHistory( $_REQUEST["preview"] ) ) { - $gBitSmarty->assign_by_ref('parsed', $gContent->parseData( $version[0] ) ); + $version[0]['parsed_data'] = $gContent->parseData( $version[0] ); + $gBitSmarty->assign_by_ref('pageInfo', $version[0] ); $gBitSmarty->assign_by_ref('version', $_REQUEST["preview"]); } } elseif( isset( $_REQUEST["diff2"] ) ) { diff --git a/templates/page_history.tpl b/templates/page_history.tpl index 50f4ae4..e4bab57 100644 --- a/templates/page_history.tpl +++ b/templates/page_history.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.8 2006/07/05 18:51:35 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_wiki/templates/page_history.tpl,v 1.9 2006/11/02 16:12:50 spiderr Exp $ *} {strip} <div class="admin wiki"> <div class="header"> @@ -10,7 +10,7 @@ <h2>{tr}Version{/tr} {$version}</h2> {/if} - {if $parsed} + {if $smarty.request.preview} {include file="bitpackage:wiki/show_page.tpl"} {/if} diff --git a/templates/rollback.tpl b/templates/rollback.tpl index 93838b5..e04a10d 100644 --- a/templates/rollback.tpl +++ b/templates/rollback.tpl @@ -2,7 +2,7 @@ <div class="wikibody">{$preview.data}</div> <div align="center"> <form action="{$smarty.const.WIKI_PKG_URL}rollback.php" method="post"> -<input type="hidden" name="page_id" value="{$pageInfo.page_id}" /> +<input type="hidden" name="content_id" value="{$gContent->mContentId}" /> <input type="hidden" name="version" value="{$version|escape}" /> <input type="submit" name="rollback" value="{tr}rollback{/tr}" /> </form> |