diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-12-07 13:31:37 -0800 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-12-07 13:31:37 -0800 |
| commit | b0b5a13131b90b8320de6f49db6c505d38b42c96 (patch) | |
| tree | 641a33e35665c3b8198fd2d641a687560342ba56 /phpBB/includes/functions_module.php | |
| parent | 74093d0fd383619ec8b58914ebe2edd68145e070 (diff) | |
| parent | 26fd70d9cdffe0107635db5f3846dbe5ea6e3fae (diff) | |
| download | forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.gz forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.bz2 forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.tar.xz forums-b0b5a13131b90b8320de6f49db6c505d38b42c96.zip | |
Merge pull request #18 from p/ticket/11015
Ticket/11015
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index ad76be9f2f..0d387ace6d 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -759,7 +759,26 @@ class p_master } } - $u_title = $module_url . $delim . 'i=' . (($item_ary['cat']) ? $item_ary['id'] : $item_ary['name'] . (($item_ary['is_duplicate']) ? '&icat=' . $current_id : '') . '&mode=' . $item_ary['mode']); + $u_title = $module_url . $delim . 'i='; + // if the item has a name use it, else use its id + if (empty($item_ary['name'])) + { + $u_title .= $item_ary['id']; + } + else + { + // if the category has a name, then use it. + $u_title .= $item_ary['name']; + } + // If the item is not a category append the mode + if (!$item_ary['cat']) + { + if ($item_ary['is_duplicate']) + { + $u_title .= '&icat=' . $current_id; + } + $u_title .= '&mode=' . $item_ary['mode']; + } // Was not allowed in categories before - /*!$item_ary['cat'] && */ $u_title .= (isset($item_ary['url_extra'])) ? $item_ary['url_extra'] : ''; |