Merge remote-tracking branch 'upstream/develop' into ticket/11015

* upstream/develop: (666 commits)
  [ticket/11077] Remove code from old global announcements system
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
  [ticket/11187] Added a blank array to fix errors in functional tests
  [ticket/10780] Make L_COLON available in the installer.
  [ticket/11183] Remove $load_extensions and weird dl() calls
  [ticket/10970] Added extra documentation to parse_dynamic_path.
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  ...

Conflicts:
	phpBB/common.php
	phpBB/download/file.php
	phpBB/includes/db/dbal.php
	phpBB/includes/db/firebird.php
	phpBB/includes/db/mssql.php
	phpBB/includes/db/mssql_odbc.php
	phpBB/includes/db/mssqlnative.php
	phpBB/includes/db/mysql.php
	phpBB/includes/db/mysqli.php
	phpBB/includes/db/oracle.php
	phpBB/includes/db/postgres.php
	phpBB/includes/db/sqlite.php
	phpBB/includes/extension/manager.php
	phpBB/install/database_update.php

phpBB/includes/cache/service.php

@@ -58,6 +58,11 @@ class phpbb_cache_service
 		return call_user_func_array(array($this->driver, $method), $arguments);
 	}
 
+	public function __get($var)
+	{
+		return $this->driver->$var;
+	}
+
 	/**
 	* Obtain list of naughty words and build preg style replacement arrays for use by the
 	* calling script
@@ -332,27 +337,22 @@ class phpbb_cache_service
 			$parsed_array = array();
 		}
 
-		$reparse = false;
 		$filename = $phpbb_root_path . 'styles/' . $style['style_path'] . '/style.cfg';
 
 		if (!file_exists($filename))
 		{
-			continue;
+			return $parsed_array;
 		}
 
 		if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
 		{
-			$reparse = true;
-		}
-
-		// Re-parse cfg file
-		if ($reparse)
-		{
+			// Re-parse cfg file
 			$parsed_array = parse_cfg_file($filename);
 			$parsed_array['filetime'] = @filemtime($filename);
 
 			$this->driver->put('_cfg_' . $style['style_path'], $parsed_array);
 		}
+
 		return $parsed_array;
 	}
 
@@ -413,4 +413,39 @@ class phpbb_cache_service
 
 		return $hook_files;
 	}
+
+	public function sql_load()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
+
+	public function sql_save($query, &$query_result, $ttl)
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), array($query, &$query_result, $ttl));
+	}
+
+	public function sql_exists()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
+
+	public function sql_fetchrow()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
+
+	public function sql_fetchfield()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
+
+	public function sql_rowseek()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
+
+	public function sql_freeresult()
+	{
+		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
+	}
 }