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/install/install_install.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/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 51cdd5b329..4b2fa046bc 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1478,8 +1478,14 @@ class install_install extends module foreach ($this->module_categories[$module_class] as $cat_name => $subs) { + $basename = ''; + // Check if this sub-category has a basename. If it has, use it. + if (isset($this->module_categories_basenames[$cat_name])) + { + $basename = $this->module_categories_basenames[$cat_name]; + } $module_data = array( - 'module_basename' => '', + 'module_basename' => $basename, 'module_enabled' => 1, 'module_display' => 1, 'parent_id' => 0, @@ -1507,8 +1513,14 @@ class install_install extends module { foreach ($subs as $level2_name) { + $basename = ''; + // Check if this sub-category has a basename. If it has, use it. + if (isset($this->module_categories_basenames[$level2_name])) + { + $basename = $this->module_categories_basenames[$level2_name]; + } $module_data = array( - 'module_basename' => '', + 'module_basename' => $basename, 'module_enabled' => 1, 'module_display' => 1, 'parent_id' => (int) $categories[$cat_name]['id'], @@ -2116,6 +2128,9 @@ class install_install extends module 'UCP_ZEBRA' => null, ), ); + var $module_categories_basenames = array( + 'UCP_PM' => 'ucp_pm', + ); var $module_extras = array( 'acp' => array( |