1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714

* 'develop' of https://github.com/phpbb/phpbb3: (119 commits)
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
  [ticket/10896] Add missing email validation lost in develop merge
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
  [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  ...

Conflicts:
	phpBB/config/tables.yml
This commit is contained in:
Joas Schilling
2013-02-25 16:04:22 +01:00
100 changed files with 4464 additions and 143 deletions

View File

@@ -97,7 +97,18 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $
}
/**
* Set config value. Creates missing config entry.
* Sets a configuration option's value.
*
* Please note that this function does not update the is_dynamic value for
* an already existing config option.
*
* @param string $config_name The configuration option's name
* @param string $config_value New configuration value
* @param bool $is_dynamic Whether this variable should be cached (false) or
* if it changes too frequently (true) to be
* efficiently cached.
*
* @return null
*
* @deprecated
*/
@@ -119,7 +130,15 @@ function set_config($config_name, $config_value, $is_dynamic = false, phpbb_conf
}
/**
* Set dynamic config value with arithmetic operation.
* Increments an integer config value directly in the database.
*
* @param string $config_name The configuration option's name
* @param int $increment Amount to increment by
* @param bool $is_dynamic Whether this variable should be cached (false) or
* if it changes too frequently (true) to be
* efficiently cached.
*
* @return null
*
* @deprecated
*/
@@ -5562,7 +5581,7 @@ function phpbb_convert_30_dbms_to_31($dbms)
/*
$reflection = new \ReflectionClass($dbms);
if ($reflection->isSubclassOf('phpbb_db_driver'))
{
return $dbms;