Permalink
Browse files

Merge branch 'master' into phpbb-com

  • Loading branch information...
callumacrae committed Apr 4, 2012
2 parents 308fd27 + 597b244 commit 892264476ec2c5ed2bf5cf6c894985d0b6bef15d
Showing with 7 additions and 0 deletions.
  1. +7 −0 titania/includes/core/titania.php
@@ -324,6 +324,13 @@ public static function build_quick_actions($quick_actions)
*/
public static function page_header($page_title = '')
{
+ // Titania must be initialized in order for page_header() to function properly.
+ // If it's not initialized at this point, it's most likely because phpBB called trigger_error() (which calls page_header()) while being initialized.
+ if (!isset(self::$time))
+ {
+ self::initialise();
+ }
+
if (!empty(titania::$hook) && titania::$hook->call_hook(array(__CLASS__, __FUNCTION__), $page_title))
{
if (titania::$hook->hook_return(array(__CLASS__, __FUNCTION__)))

0 comments on commit 8922644

Please sign in to comment.