Skip to content

Commit d01fa82

Browse files
committed
[ticket/17361] Use new adapter options format in acp_storage
PHPBB-17361
1 parent 34434d3 commit d01fa82

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

db/migration/data/v400/storage_backup_data.php

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public function update_backup_data()
4242
{
4343
while (($file = readdir($dh)) !== false)
4444
{
45-
echo "FILE $file\n";
4645
if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
4746
{
4847
if (in_array($matches[2], $methods))

language/language.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ public function is_set($key)
230230
* Params are the language key and the parameters to be substituted.
231231
* This function/functionality is inspired by SHS` and Ashe.
232232
*
233-
* Example call: <samp>$user->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
233+
* Example call: <samp>$language->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
234234
*
235235
* If the first parameter is an array, the elements are used as keys and subkeys to get the language entry:
236-
* Example: <samp>$user->lang(array('datetime', 'AGO'), 1)</samp> uses $user->lang['datetime']['AGO'] as language entry.
236+
* Example: <samp>$language->lang(array('datetime', 'AGO'), 1)</samp> uses $language->lang['datetime']['AGO'] as language entry.
237237
*
238238
* @return string Return localized string or the language key if the translation is not available
239239
*/

storage/adapter_factory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function get_with_options(string $storage_name, string $provider_class, a
8989
}
9090

9191
$adapter = $this->adapters->get_by_class($provider->get_adapter_class());
92-
$options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensiosn
92+
$options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensions
9393
$adapter->configure($options);
9494

9595
return $adapter;

0 commit comments

Comments
 (0)