X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fleft_main.tpl;h=6d9169c78c859ed63b12d9f0867ddad623c2ad67;hp=27fada32e99638b8a2c02ae5363c503a25cf0d49;hb=e883b46ee74c1f2d5ea382bded08a3e728cc47d5;hpb=bd116f83cc7235e0156ea60340b905a71dad5b2a;ds=sidebyside diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl index 27fada32..6d9169c7 100644 --- a/templates/default/left_main.tpl +++ b/templates/default/left_main.tpl @@ -209,6 +209,11 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) } } + // Add any extra output that may have been added by plugins, etc + // + if (!empty($box['ExtraOutput'])) + $end .= $box['ExtraOutput']; + $span = ''; $spanend = ''; if ($settings['useSpecialFolderColor'] && $box['IsSpecial']) { @@ -219,22 +224,6 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) $spanend = ''; } -/******** - * Pulling imapConnection due to segfaults that cannot be tracked down. Best - * we can determine, it's some combination of this var and >= 4 plugins enabled. - * No further clue from anyone. - ******** - * Update: syntax of this hook call changed a bit, so if the error is so anomalous, - * it might be worth trying this again to see if it is still segfaulting - ******** - - // let plugins fiddle with end of line -// FIXME: no hooks in templates! Although note that I'm not sure we can avoid it here because the context of which folder we are displaying is important to the hook, unless we preemptively iterate through all folders and collect the output from the hook call for that and give that to the template.... seems like overkill; I say this hook remains - $end .= concat_hook_function('left_main_after_each_folder', - $temp=array(isset($numMessages) ? &$numMessages : '', - &$box['MailboxFullName'], &$settings['imapConnection'])); -*/ - $end .= ''; $out = '';