From 91dfea7787999dc01b8996bbc5a777ea1dac51b6 Mon Sep 17 00:00:00 2001
From: tomas <tomas@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Thu, 28 Jul 2005 11:43:49 +0000
Subject: [PATCH] minor change

---
 livesupport/modules/alib/var/m2tree.php     | 3 ++-
 livesupport/modules/alib/var/m2treeTest.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/livesupport/modules/alib/var/m2tree.php b/livesupport/modules/alib/var/m2tree.php
index 7fbb5ff1a..0682c3065 100644
--- a/livesupport/modules/alib/var/m2tree.php
+++ b/livesupport/modules/alib/var/m2tree.php
@@ -22,7 +22,7 @@ define('ALIBERR_MTREE', 10);
  *    );
  *   </code></pre>
  *  @author  $Author: tomas $
- *  @version $Revision: 1.5 $
+ *  @version $Revision: 1.6 $
  *  @see ObjClasses
  *  Original author Tom Hlava
  */
@@ -397,6 +397,7 @@ class M2tree{
             LEFT JOIN {$this->structTable} s ON id=objid AND parid=$rootId
             WHERE id=$oid
         ");
+        if($this->dbc->isError($re)) return $re;
         $re['level'] = intval($re['level']);
         return $re;
     }
diff --git a/livesupport/modules/alib/var/m2treeTest.php b/livesupport/modules/alib/var/m2treeTest.php
index 5f8b53211..e57755b61 100644
--- a/livesupport/modules/alib/var/m2treeTest.php
+++ b/livesupport/modules/alib/var/m2treeTest.php
@@ -2,7 +2,7 @@
 require_once"m2tree.php";
 
 class M2treeTest extends M2tree{
-    function _test_addObj()
+    function _test_init()
     {
         for($i=1; $i<=3; $i++){
             $r = $this->addObj("Publication$i", "Publication");
@@ -27,7 +27,7 @@ class M2treeTest extends M2tree{
     }
     function _test_check($title, $expected, $returned)
     {
-        if($expected != $returned){
+        if($expected !== $returned){
             return $this->dbc->raiseError(
                 "m2tree::$title FAILED:\n".
                 " ###expected:\n$expected\n ---\n".
@@ -41,7 +41,7 @@ class M2treeTest extends M2tree{
         echo "# M2tree test:\n";
 
         // addObj/dumpTree test:
-        $r = $this->_test_addObj();
+        $r = $this->_test_init();
         if($this->dbc->isError($r)) return $r;
         $expected = "RootNode
     Publication1
@@ -202,7 +202,7 @@ class M2treeTest extends M2tree{
         $r = $this->_test_check('reset', $expected, $returned);
         if($this->dbc->isError($r)) return $r; else echo $r;
 
-        echo "# OK\n";
+        echo "# M2tree OK\n";
         return TRUE;
     }