From 00598ecd73ff3f2ece0a2a9f41431fcc986ecf24 Mon Sep 17 00:00:00 2001 From: Max Kremmel Date: Fri, 20 Jan 2006 11:10:10 +0000 Subject: merge recent changes into HEAD --- admin/upgrade_inc.php | 2 +- bit_setup_inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 8ad44b4..ecc0c0f 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -5,7 +5,7 @@ global $gBitSystem, $gUpgradeFrom, $gUpgradeTo; $upgrades = array( 'BONNIE' => array( - 'CLYDE' => array( + 'BWR1' => array( // STEP 1 array( 'DATADICT' => array( array( 'RENAMECOLUMN' => array( diff --git a/bit_setup_inc.php b/bit_setup_inc.php index c5846d3..5addcbe 100644 --- a/bit_setup_inc.php +++ b/bit_setup_inc.php @@ -3,6 +3,6 @@ $gBitSystem->registerPackage( 'rss', dirname( __FILE__).'/' ); if( $gBitSystem->isPackageActive( 'rss' ) ) { - $gBitSystem->registerAppMenu( RSS_PKG_DIR, 'RSS', RSS_PKG_URL.'index.php', 'bitpackage:rss/menu_rss.tpl', 'rss' ); + $gBitSystem->registerAppMenu( RSS_PKG_NAME, 'RSS', RSS_PKG_URL.'index.php', 'bitpackage:rss/menu_rss.tpl', 'rss' ); } ?> -- cgit v1.3