Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
This commit is contained in:
Nils Adermann 2010-08-30 00:20:21 +02:00
commit 0245ac581e

View file

@ -48,6 +48,7 @@ if (isset($_GET['avatar']))
require($phpbb_root_path . 'includes/cache.' . $phpEx); require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
$db = new $sql_db(); $db = new $sql_db();
$cache = new cache(); $cache = new cache();