| Line 480 | Line 480 |
|---|
*/
function set_active($id = false, $mode = false)
{
|
*/
function set_active($id = false, $mode = false)
{
|
global $request;
| global $auth, $request, $user;
|
$icat = false;
$this->active_module = false;
|
$icat = false;
$this->active_module = false;
|
| Line 500 | Line 500 |
|---|
if ($id && !is_numeric($id) && !$this->is_full_class($id))
{
$id = $this->p_class . '_' . $id;
|
if ($id && !is_numeric($id) && !$this->is_full_class($id))
{
$id = $this->p_class . '_' . $id;
|
| | }
// Fallback to acp main page for special restore permission mode
if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
{
$id = '';
$mode = '';
$icat = false;
|
}
$category = false;
| }
$category = false;
|
| Line 662 | Line 670 |
|---|
// Add url_extra parameter to u_action url
if (!empty($this->module_ary) && $this->active_module !== false && $this->module_ary[$this->active_module_row_id]['url_extra'])
{
|
// Add url_extra parameter to u_action url
if (!empty($this->module_ary) && $this->active_module !== false && $this->module_ary[$this->active_module_row_id]['url_extra'])
{
|
$this->module->u_action .= $this->module_ary[$this->active_module_row_id]['url_extra'];
| $this->module->u_action .= '&' . $this->module_ary[$this->active_module_row_id]['url_extra'];
|
}
// Assign the module path for re-usage
| }
// Assign the module path for re-usage
|
| Line 920 | Line 928 |
|---|
}
// Was not allowed in categories before - /*!$item_ary['cat'] && */
|
}
// Was not allowed in categories before - /*!$item_ary['cat'] && */
|
$u_title .= (isset($item_ary['url_extra'])) ? $item_ary['url_extra'] : '';
| $u_title .= (isset($item_ary['url_extra']) && $item_ary['url_extra']) ? '&' . $item_ary['url_extra'] : '';
|
// Only output a categories items if it's currently selected
if (!$depth || ($depth && (in_array($item_ary['parent'], array_values($this->module_cache['parents'])) || $item_ary['parent'] == $this->p_parent)))
|
// Only output a categories items if it's currently selected
if (!$depth || ($depth && (in_array($item_ary['parent'], array_values($this->module_cache['parents'])) || $item_ary['parent'] == $this->p_parent)))
|
