summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorspider@app1 <spiderr@bitweaver.org>2016-06-21 12:01:02 -0400
committerspider@app1 <spiderr@bitweaver.org>2016-06-21 12:01:02 -0400
commit743efb8fd81949ccbfc76814cb0262ab8aec4afa (patch)
treec0620ec68e5051e3bb9d98159a21208475c3a89c /modules
parent62b3bc74acf5663c9f29c37440245b23498beceb (diff)
downloadkernel-743efb8fd81949ccbfc76814cb0262ab8aec4afa.tar.gz
kernel-743efb8fd81949ccbfc76814cb0262ab8aec4afa.tar.bz2
kernel-743efb8fd81949ccbfc76814cb0262ab8aec4afa.zip
update for BitSystem::get(set)ActivePackage() instead of ACTIVE_PACKAGE
Diffstat (limited to 'modules')
-rw-r--r--modules/mod_package_icons.tpl2
-rw-r--r--modules/mod_package_menu.php2
-rw-r--r--modules/mod_packages.tpl6
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/mod_package_icons.tpl b/modules/mod_package_icons.tpl
index 3295172..2c56911 100644
--- a/modules/mod_package_icons.tpl
+++ b/modules/mod_package_icons.tpl
@@ -2,7 +2,7 @@
{bitmodule title="$moduleTitle" name="packages_icons"}
{foreach key=key item=menu from=$gBitSystem->mAppMenu}
{if $menu.menu_template}
- <a class="{if $gBitSystem->mActivePackage eq $key}active{/if}" href="{$menu.index_url}">{biticon ipackage=$key iname="pkg_`$key`" iexplain=$menu.menu_title}</a>
+ <a class="{if $gBitSystem->getActivePackage() eq $key}active{/if}" href="{$menu.index_url}">{biticon ipackage=$key iname="pkg_`$key`" iexplain=$menu.menu_title}</a>
{/if}
{/foreach}
{/bitmodule}
diff --git a/modules/mod_package_menu.php b/modules/mod_package_menu.php
index 6f5a2aa..290c273 100644
--- a/modules/mod_package_menu.php
+++ b/modules/mod_package_menu.php
@@ -12,7 +12,7 @@ if( $gBitUser->isAdmin() ) {
$admin = false;
}
-$package = !empty($moduleParams['module_params']['package'])?$moduleParams['module_params']['package']:ACTIVE_PACKAGE;
+$package = !empty($moduleParams['module_params']['package'])?$moduleParams['module_params']['package']:$gBitSystem->getActivePackage();
if( !empty( $gBitSystem->mAppMenu[$package]['menu_template'] ) && !$admin ) {
$_template->tpl_vars['packageMenu'] = new Smarty_variable( $gBitSystem->mAppMenu[$package] );
diff --git a/modules/mod_packages.tpl b/modules/mod_packages.tpl
index cc0597d..a9968b9 100644
--- a/modules/mod_packages.tpl
+++ b/modules/mod_packages.tpl
@@ -3,13 +3,13 @@
<ul class="menu">
{foreach key=key item=menu from=$gBitSystem->mAppMenu}
{if $menu.menu_template}
- <li{if $gBitSystem->mActivePackage eq $menu.package_name} class="active"{/if}><a class="head" href="{$menu.index_url}">{$menu.menu_title}</a></li>
+ <li{if $gBitSystem->getActivePackage() eq $menu.package_name} class="active"{/if}><a class="head" href="{$menu.index_url}">{$menu.menu_title}</a></li>
{/if}
{/foreach}
{if $gBitUser->isAdmin()}
- <li{if $gBitSystem->mActivePackage eq 'kernel'} class="active"{/if}><a class="head" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php">{tr}Administration{/tr}</a></li>
+ <li{if $gBitSystem->getActivePackage() eq 'kernel'} class="active"{/if}><a class="head" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php">{tr}Administration{/tr}</a></li>
{/if}
</ul>
{/bitmodule}
-{/strip} \ No newline at end of file
+{/strip}