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

diff --git a/src/left_main.php b/src/left_main.php
index 412a6d4e5de73f69c2f3d6d43ef5690fbf4bf8b0..ed5ed23d7c8af5a02158e243c194bfa64a66b941 100644 (file)
--- 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 becdde505993192b5c9149350ddb47a9e98f193a..106bc236ff11e401c4eab18b2043fb5a6f59d125 100644 (file)
--- 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 = '</span>';
     }
 
+/********
+ * 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 .= '</span>';
 

diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl
index 5f74ac5747c4fc3ec27a544aecfdd6708d8c6345..423799d47be084328af71415d4509c731e71b8a9 100644 (file)
--- 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