diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:42:03 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-08-01 18:42:03 +0000 |
| commit | bd974e32890c11bad1e3b70f936d3026ef59edbf (patch) | |
| tree | 0dfbb789db4f0a832cdddc8fac72027bba4c6fca /module_controls_inc.php | |
| parent | b5bf27ddc4ddac64a14fa82c2262acb10b5335cf (diff) | |
| download | users-bd974e32890c11bad1e3b70f936d3026ef59edbf.tar.gz users-bd974e32890c11bad1e3b70f936d3026ef59edbf.tar.bz2 users-bd974e32890c11bad1e3b70f936d3026ef59edbf.zip | |
merge recent changes with HEAD - R1 and HEAD are identical now
Diffstat (limited to 'module_controls_inc.php')
| -rw-r--r-- | module_controls_inc.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/module_controls_inc.php b/module_controls_inc.php index d2a0957..76f6a17 100644 --- a/module_controls_inc.php +++ b/module_controls_inc.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.3 2005/08/01 18:42:02 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: module_controls_inc.php,v 1.2 2005/06/28 07:46:23 spiderr Exp $ + * $Id: module_controls_inc.php,v 1.3 2005/08/01 18:42:02 squareing Exp $ * @package users * @subpackage functions */ @@ -18,17 +18,17 @@ $check_req = (isset($_REQUEST["mc_unassign"]) || isset($_REQUEST["mc_down"]) || isset($_REQUEST["mc_move"])); if (!$gBitUser->hasPermission( 'bit_p_configure_modules' ) && $check_req) { - $smarty->assign('msg', tra("You dont have permission to use this feature")); + $gBitSmarty->assign('msg', tra("You dont have permission to use this feature")); $gBitSystem->display( 'error.tpl' ); die; } if ($user_assigned_modules != 'y' && $check_req) { - $smarty->assign('msg', tra("This feature is disabled").": user_assigned_modules"); + $gBitSmarty->assign('msg', tra("This feature is disabled").": user_assigned_modules"); $gBitSystem->display( 'error.tpl' ); die; } if ( !$gBitUser->isRegistered() && $check_req) { - $smarty->assign('msg', tra("You must log in to use this feature")); + $gBitSmarty->assign('msg', tra("You must log in to use this feature")); $gBitSystem->display( 'error.tpl' ); die; } @@ -55,6 +55,6 @@ if ($check_req) { } // Fix locaton if parameter was removed... if ($url != $_SERVER["REQUEST_URI"]) header('location: '.$url); -$smarty->assign('current_location', $url); -$smarty->assign('mpchar', (strpos($url, '?') ? '&' : '?')); +$gBitSmarty->assign('current_location', $url); +$gBitSmarty->assign('mpchar', (strpos($url, '?') ? '&' : '?')); ?> |