mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop

Browse Source 
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
This commit is contained in:
Dhruv
2013-08-08 13:56:39 +05:30
parent 08a6bd2218 32499c8808
commit f35d732f40
11 changed files with 175 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php
View File

@@ -108,7 +108,7 @@ class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
WHERE user_id = $bot_user_id";
$this->sql_query($sql);
user_delete('remove', $bot_user_id);
user_delete('retain', $bot_user_id);
}
else
{

12
phpBB/phpbb/di/extension/core.php
View File

@@ -26,19 +26,19 @@ use Symfony\Component\Config\FileLocator;
class phpbb_di_extension_core extends Extension
{
/**
* phpBB Root path
* Config path
* @var string
*/
protected $root_path;
protected $config_path;
/**
* Constructor
*
* @param string $root_path Root path
* @param string $config_path Config path
*/
public function __construct($root_path)
public function __construct($config_path)
{
$this->root_path = $root_path;
$this->config_path = $config_path;
}
/**
@@ -51,7 +51,7 @@ class phpbb_di_extension_core extends Extension
*/
public function load(array $config, ContainerBuilder $container)
{
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
$loader->load('services.yml');
}

7
phpBB/phpbb/user.php
View File

@@ -590,6 +590,13 @@ class phpbb_user extends phpbb_session
$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
}
// If we are in install, try to use the updated version, when available
$install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
if (defined('IN_INSTALL') && file_exists($install_language_filename))
{
$language_filename = $install_language_filename;
}
if (!file_exists($language_filename))
{
global $config;