[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pear-cvs
Subject:    [PEAR-CVS] =?utf-8?q?svn:_/pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/_HTML/Smarty/H
From:       Chuck_Burgess <ashnazg () php ! net>
Date:       2011-09-30 22:54:26
Message-ID: svn-ashnazg-1317423266-317560-952857595 () svn ! php ! net
[Download RAW message or body]

ashnazg                                  Fri, 30 Sep 2011 22:54:26 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317560

Log:
Bug #17395:  Fatal Error when trying to run document

Bug: http://pear.php.net/bugs/17395 (unknown) 
      
Changed paths:
    U   pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
  U   pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
  U   pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc


Modified: pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
 ===================================================================
--- pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc	2011-09-30 \
                22:26:30 UTC (rev 317559)
+++ pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc	2011-09-30 \
22:54:26 UTC (rev 317560) @@ -1375,7 +1375,11 @@
         $lastcur = array(false);
         $kids = array();
         $dopar = false;
-        if (!$noparent && $tree[$cur]['parent'])
+        if (
+            !$noparent
+            && isset($tree[$cur]['parent'])
+            && $tree[$cur]['parent']
+        )
         {
             $dopar = true;
             if (!is_object($tree[$cur]['parent']))
@@ -1402,10 +1406,13 @@
                 {
 //                    debug("set $cur kids");
                     $kids[$cur] = 1;
+                    $thisLinkName = isset($tree[$cur]['link']->name) ? \
$tree[$cur]['link']->name : ''; +                    $thisLinkPackage = \
isset($tree[$cur]['link']->package) ? $tree[$cur]['link']->package : '';  $root = \
                $this->classes->getClassByPackage(
-                        $tree[$cur]['link']->name,
-                        $tree[$cur]['link']->package);
-                    if ($implements = $root->getImplements()) {
+                        $thisLinkName,
+                        $thisLinkPackage
+                    );
+                    if ($root && $implements = $root->getImplements()) {
                         $my_tree .= '<li>'.$this->returnSee($tree[$cur]['link']) .
                             ' (implements ';
                         foreach ($implements as $i => $interface) {

Modified: pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
 ===================================================================
--- pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc	2011-09-30 \
                22:26:30 UTC (rev 317559)
+++ pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc	2011-09-30 \
22:54:26 UTC (rev 317560) @@ -1323,7 +1323,11 @@
         $lastcur = array(false);
         $kids = array();
         $dopar = false;
-        if (!$noparent && $tree[$cur]['parent'])
+        if (
+            !$noparent
+            && isset($tree[$cur]['parent'])
+            && $tree[$cur]['parent']
+        )
         {
             $dopar = true;
             if (!is_object($tree[$cur]['parent']))
@@ -1350,10 +1354,13 @@
                 {
 //                    debug("set $cur kids");
                     $kids[$cur] = 1;
+                    $thisLinkName = isset($tree[$cur]['link']->name) ? \
$tree[$cur]['link']->name : ''; +                    $thisLinkPackage = \
isset($tree[$cur]['link']->package) ? $tree[$cur]['link']->package : '';  $root = \
                $this->classes->getClassByPackage(
-                        $tree[$cur]['link']->name,
-                        $tree[$cur]['link']->package);
-                    if ($implements = $root->getImplements()) {
+                        $thisLinkName,
+                        $thisLinkPackage
+                    );
+                    if ($root && $implements = $root->getImplements()) {
                         $my_tree .= '<li>'.$this->returnSee($tree[$cur]['link']) .
                             ' (implements ';
                         foreach ($implements as $i => $interface) {

Modified: pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc
 ===================================================================
--- pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc	2011-09-30 \
                22:26:30 UTC (rev 317559)
+++ pear/packages/PhpDocumentor/trunk/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc	2011-09-30 \
22:54:26 UTC (rev 317560) @@ -689,7 +689,7 @@
         $lastcur = array(false);
         $kids = array();
         $dopar = false;
-        if ($tree[$cur]['parent'])
+        if (isset($tree[$cur]['parent']) && $tree[$cur]['parent'])
         {
             $dopar = true;
             if (!is_object($tree[$cur]['parent']))



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]