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

# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php

phpBB/phpbb/template/twig/twig.php

@@ -470,15 +470,15 @@ class phpbb_template_twig implements phpbb_template
 
 		$vars = array_merge(
 			$context_vars['.'][0], // To get normal vars
-			$context_vars, // To get loops
 			array(
 				'definition'	=> new phpbb_template_twig_definition(),
 				'user'			=> $this->user,
+				'loops'			=> $context_vars, // To get loops
 			)
 		);
 
 		// cleanup
-		unset($vars['.']);
+		unset($vars['loops']['.']);
 
 		return $vars;
 	}