mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00
Code Issues Releases Wiki Activity

Merge PR #545 branch 'brunoais/ticket/10601' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2012-12-01 15:09:38 -05:00
parent ab6c284ddd 1ce0671181
commit 21caf6db6f
3 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/install/install_install.php
View File

@@ -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(