Merge 3.5.7

This commit is contained in:
Romain Neutron
2012-01-03 15:26:07 +01:00
28 changed files with 43087 additions and 42105 deletions

View File

@@ -893,6 +893,11 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{
return $this->is_template;
}
public function is_special()
{
return in_array($this->login, array('invite', 'autoregister'));
}
public function get_template_owner()
{