- $hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
- $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+ $userexists = $User && property_exists($User, 'login') && $User->login;
+ if (! ($userexists and !empty($this->editable)) ) {
+ # remove matching elements until first corresponding closing tag
+ $hideclass = $userexists ? 'logout' : 'login';
+ $tagmatch = '<([a-z]+) class="'.$hideclass.'"[^>]*>';
+ $doc = preg_replace("{\s*{$tagmatch}.*?</\\1>}s", '', $doc);
+ }