From 535ca3710b87c6ea9bd1f5fc63390df7658c6d90 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Mon, 18 Sep 2006 20:11:34 +0000 Subject: [PATCH] Pulling imapConnection var. Still causes segfaults which cannot be tracked down. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11718 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/left_main.php | 2 +- templates/default/left_main.tpl | 9 +++++++-- templates/default_advanced/left_main.tpl | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/left_main.php b/src/left_main.php index 412a6d4e..ed5ed23d 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -191,7 +191,7 @@ $oTemplate->assign('mailboxes', $mailbox_structure); * globals, which are dirty, filthy things in templates. :) */ $settings = array(); -$settings['imapConnection'] = $imapConnection; +#$settings['imapConnection'] = $imapConnection; $settings['iconThemePath'] = $icon_theme_path; $settings['templateDirectory'] = $sTplDir; $settings['unreadNotificationEnabled'] = $unseen_notify!=1; diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl index becdde50..106bc236 100644 --- a/templates/default/left_main.tpl +++ b/templates/default/left_main.tpl @@ -8,8 +8,6 @@ * $clock - formatted string containing last refresh * $settings - Array containing user perferences needed by this * template. Indexes are as follows: - * $settings['imapConnection'] - IMAP connection handle. Needed to - * allow plugins to read the mailbox. * $settings['iconThemePath'] - Path to the desired icon theme. If * the user has disabled icons, this will be NULL. * $settings['templateDirectory'] - contains the path to the current @@ -225,10 +223,17 @@ function buildMailboxTree ($box, $settings, $indent_factor=0) { $spanend = ''; } +/******** + * Pulling imapConnection due to segfaults that cannot be tracked down. Best + * we can determine,its some combination of this var and >= 4 plugins enabled. + * No further clue from anyone. + ******** + // let plugins fiddle with end of line $end .= concat_hook_function('left_main_after_each_folder', array(isset($numMessages) ? $numMessages : '', $box['MailboxFullName'], $settings['imapConnection'])); +*/ $end .= ''; diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl index 5f74ac57..423799d4 100644 --- a/templates/default_advanced/left_main.tpl +++ b/templates/default_advanced/left_main.tpl @@ -12,8 +12,6 @@ * $clock - formatted string containing last refresh * $settings - Array containing user perferences needed by this * template. Indexes are as follows: - * $settings['imapConnection'] - IMAP connection handle. Needed to - * allow plugins to read the mailbox. * $settings['iconThemePath'] - Path to the desired icon theme. If * the user has disabled icons, this will be NULL. * $settings['templateDirectory'] - contains the path to the current -- 2.25.1