Brought CVS up to date with 1.2.0 rc1

[squirrelmail.git] / functions / tree.php

diff --git a/functions/tree.php b/functions/tree.php
index 9871d45a6e30d907446b29eea764a55f88371033..cda8c8e361d6b5f570ed362f697d797265b3d3e7 100644 (file)
--- a/functions/tree.php
+++ b/functions/tree.php
@@ -2,12 +2,11 @@
 
    /* $Id$ */
 
-   $tree_php = true;
+   if (defined('tree_php'))
+       return;
+   define('tree_php', true);
 
-   if (!isset($imap_php))
-      include('../functions/imap.php');
-   if (!isset($config_php))
-      include('../config/config.php');
+   include('../functions/imap.php');
 
    // Recursive function to find the correct parent for a new node
    function findParentForChild($value, $treeIndexToStart, $tree) {
@@ -127,4 +126,4 @@
          echo $tree[$index]['value'] . '<br>';
       }
    }
-?>
\ No newline at end of file
+?>