[Phpbb-checkins] r10215 - in /trunk/phpBB: ./ includes/functions_user.php includes/template.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Oct  6 14:40:01 2009
New Revision: 10215

Log:
(a little test for later merges)
reintegrate branch into trunk (r10214)

Modified:
    trunk/phpBB/   (props changed)
    trunk/phpBB/includes/functions_user.php
    trunk/phpBB/includes/template.php

Propchange: trunk/phpBB/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/phpBB-3_0_0/phpBB:10211-10214

Modified: trunk/phpBB/includes/functions_user.php
==============================================================================
*** trunk/phpBB/includes/functions_user.php (original)
--- trunk/phpBB/includes/functions_user.php Tue Oct  6 14:40:01 2009
***************
*** 2832,2842 ****
  
  	if ($config['coppa_enable'])
  	{
! 		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
  	}
  	else
  	{
! 		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED', 'BOTS', 'GUESTS');
  	}
  
  	// We need both username and user_id info
--- 2832,2842 ----
  
  	if ($config['coppa_enable'])
  	{
! 		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS');
  	}
  	else
  	{
! 		$group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'NEWLY_REGISTERED', 'REGISTERED', 'BOTS', 'GUESTS');
  	}
  
  	// We need both username and user_id info

Modified: trunk/phpBB/includes/template.php
==============================================================================
*** trunk/phpBB/includes/template.php (original)
--- trunk/phpBB/includes/template.php Tue Oct  6 14:40:01 2009
***************
*** 248,255 ****
  	{
  		global $user, $phpEx, $config;
  
  		$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! 		$this->files_template[$handle] = $user->theme['template_id'];
  
  		$recompile = false;
  		if (!file_exists($filename) || @filesize($filename) === 0)
--- 248,260 ----
  	{
  		global $user, $phpEx, $config;
  
+ 		if (!isset($this->filename[$handle]))
+ 		{
+ 			trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
+ 		}
+ 
  		$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
! 		$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
  
  		$recompile = false;
  		if (!file_exists($filename) || @filesize($filename) === 0)