diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-01 15:09:38 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-01 15:09:38 -0500 |
| commit | 21caf6db6ffe8f58b663bd2d0441626ecdb02e72 (patch) | |
| tree | 072a0e06d5ba128dfba985a4523d079f74541301 /phpBB/includes/functions_module.php | |
| parent | ab6c284dddecebbe359874e205c7e2ed15e38ac1 (diff) | |
| parent | 1ce06711811561d2e3fa3c6ba2aeac4ebffa6581 (diff) | |
| download | forums-21caf6db6ffe8f58b663bd2d0441626ecdb02e72.tar forums-21caf6db6ffe8f58b663bd2d0441626ecdb02e72.tar.gz forums-21caf6db6ffe8f58b663bd2d0441626ecdb02e72.tar.bz2 forums-21caf6db6ffe8f58b663bd2d0441626ecdb02e72.tar.xz forums-21caf6db6ffe8f58b663bd2d0441626ecdb02e72.zip | |
Merge PR #545 branch 'brunoais/ticket/10601' into develop
* brunoais/ticket/10601:
[ticket/10601] The ORDER BY is only taking space there
[ticket/10601] New approach in the update algorithm
[ticket/10601] Comment to help understanding the code
[ticket/10601] Requested code changes
[ticket/10601] Cosmetic code changes
[ticket/10601] Database updating code v2
[ticket/10601] Database updating code
[ticket/10601] Comment explaning the basename applied to categories
[ticket/10601] Correctly access class property
[ticket/10601]Move Inbox the default in private messages module
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'] : ''; |