1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

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
This commit is contained in:
Oleg Pudeyev
2012-12-01 15:09:38 -05:00
3 changed files with 59 additions and 3 deletions

View File

@@ -2770,6 +2770,28 @@ function change_database_data(&$no_updates, $version)
$config->set('site_home_text', '');
}
// PHPBB3-10601: Make inbox default. Add basename to ucp's pm category
// Get the category wanted while checking, at the same time, if this has already been applied
$sql = 'SELECT module_id, module_basename
FROM ' . MODULES_TABLE . "
WHERE module_basename <> 'ucp_pm' AND
module_langname='UCP_PM'
";
$result = $db->sql_query_limit($sql, 1);
if ($row = $db->sql_fetchrow($result))
{
// This update is still not applied. Applying it
$sql = 'UPDATE ' . MODULES_TABLE . "
SET module_basename = 'ucp_pm'
WHERE module_id = " . (int) $row['module_id'];
_sql($sql, $errored, $error_ary);
}
$db->sql_freeresult($result);
break;
}
}