mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
# By Nathan Guse (28) and others
# Via Andreas Fischer (9) and others
* 'develop' of https://github.com/phpbb/phpbb3: (90 commits)
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
  [feature/migrations] Remove default values from necessary parameters
  [ticket/11201] Revert WLM dropping because it is still used in China.
  [ticket/11220] Improvement to the info pop-up from "list="
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
  [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
  [ticket/10050] removing prosilver edits
  [ticket/9737] Fix some comments
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
  [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
  [ticket/10050] adding .topicrow to template condition
  [ticket/9737] Fix a few minor things in migrations
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/config/tables.yml
This commit is contained in:
Nathaniel Guse
2013-02-11 21:37:15 -06:00
parent e4c37c159a fa33eae556
commit 54e9f7b50a
63 changed files with 4153 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_groups.php
View File

@@ -439,7 +439,7 @@ class acp_groups
foreach ($test_variables as $test => $type)
{
if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || in_array($test, $set_attributes)))
if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes)))
{
settype($submit_ary[$test], $type);
$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];