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

[ticket/17361] Use new adapter options format in acp_storage

Browse Source 
PHPBB-17361
This commit is contained in:
Ruben Calvo
2024-11-30 14:45:19 +01:00
parent 1f7ae9e2b0
commit d6953a0422
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/db/migration/data/v400/storage_backup_data.php
View File

@@ -42,7 +42,6 @@ class storage_backup_data extends migration
{
while (($file = readdir($dh)) !== false)
{
echo "FILE $file\n";
if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
{
if (in_array($matches[2], $methods))

4
phpBB/phpbb/language/language.php
View File

@@ -230,10 +230,10 @@ class language
* Params are the language key and the parameters to be substituted.
* This function/functionality is inspired by SHS` and Ashe.
*
* Example call: <samp>$user->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
* Example call: <samp>$language->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
*
* If the first parameter is an array, the elements are used as keys and subkeys to get the language entry:
* Example: <samp>$user->lang(array('datetime', 'AGO'), 1)</samp> uses $user->lang['datetime']['AGO'] as language entry.
* Example: <samp>$language->lang(array('datetime', 'AGO'), 1)</samp> uses $language->lang['datetime']['AGO'] as language entry.
*
* @return string Return localized string or the language key if the translation is not available
*/

2
phpBB/phpbb/storage/adapter_factory.php
View File

@@ -89,7 +89,7 @@ class adapter_factory
}
$adapter = $this->adapters->get_by_class($provider->get_adapter_class());
$options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensiosn
$options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensions
$adapter->configure($options);
return $adapter;