Changeset 15597

Show
Ignore:
Timestamp:
06/07/12 23:33:30 (12 months ago)
Author:
plg
Message:

bug 2649: broken code commited in r15587, fixed with a simpler condition

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/include/common.inc.php

    r15587 r15597  
    193193else 
    194194{ // Classic template 
    195   $theme = script_basename() != 'ws' and mobile_theme() ? $conf['mobile_theme'] : $user['theme']; 
     195  $theme = $user['theme']; 
     196  if (script_basename() != 'ws' and mobile_theme()) 
     197  { 
     198    $theme = $conf['mobile_theme']; 
     199  } 
    196200  $template = new Template(PHPWG_ROOT_PATH.'themes', $theme ); 
    197201}