summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/schema_inc.php4
-rw-r--r--plugins/format.tikiwiki.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index cf81e0a..9d82af7 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -197,8 +197,8 @@ $gBitInstaller->registerSchemaSequences( LIBERTY_PKG_NAME, $sequences );
// ### Default Preferences
$gBitInstaller->registerPreferences( LIBERTY_PKG_NAME, array(
- array(LIBERTY_PKG_NAME, 'cacheimages','n'),
- array(LIBERTY_PKG_NAME, 'cachepages','n'),
+ array(LIBERTY_PKG_NAME, 'liberty_cache_images','n'),
+ array(LIBERTY_PKG_NAME, 'liberty_cache_pages','n'),
array(LIBERTY_PKG_NAME, 'default_format','tikiwiki'),
array(LIBERTY_PKG_NAME, 'liberty_auto_display_attachment_thumbs', 'y'),
// array(LIBERTY_PKG_NAME, 'liberty_attachment_link_format', 'wiki') not needed anymore since we use js in the edit page now (depends on format of content)
diff --git a/plugins/format.tikiwiki.php b/plugins/format.tikiwiki.php
index 7b16a24..bd7b0aa 100644
--- a/plugins/format.tikiwiki.php
+++ b/plugins/format.tikiwiki.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Revision: 1.46 $
+ * @version $Revision: 1.47 $
* @package liberty
*/
global $gLibertySystem;
@@ -603,7 +603,7 @@ class TikiWikiParser extends BitBase {
function cache_links($links, &$pCommonObject ) {
global $gBitSystem;
- if( $gBitSystem->isFeatureActive( 'cachepages' ) ) {
+ if( $gBitSystem->isFeatureActive( 'liberty_cache_pages' ) ) {
foreach ($links as $link) {
if( !$pCommonObject->isCached( $link ) ) {
$pCommonObject->cacheUrl($link);
@@ -1056,7 +1056,7 @@ class TikiWikiParser extends BitBase {
// enter square brackets in their output; things like [[foo]
// get rendered as [foo]. -rlpowell
- if( $gBitSystem->isFeatureActive( 'cachepages') && $pCommonObject->isCached( $link ) ) {
+ if( $gBitSystem->isFeatureActive( 'liberty_cache_pages') && $pCommonObject->isCached( $link ) ) {
//use of urlencode for using cached versions of dynamic sites
$cosa = "<a class=\"bitcache\" href=\"".KERNEL_PKG_URL."view_cache.php?url=".urlencode($link)."\">(cache)</a>";