File: includes/functions_module.php
Unmodified
Added
Modified
Removed
| Line 445 | Line 445 |
|---|
break;
default:
|
break;
default:
|
if (!preg_match('#(?:' . implode(array_keys($valid_tokens), ')|(?:') . ')#', $token))
| if (!preg_match('#(?:' . implode(')|(?:', array_keys($valid_tokens)) . ')#', $token))
|
{
$token = '';
}
| {
$token = '';
}
|
| Line 662 | Line 662 |
|---|
// 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 920 |
|---|
}
// 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)))
|
