cvs: pear /PhpDocumentor/phpDocumentor/Converters/HTML/Smarty HTMLSmartyConverter.inc /PhpDocumentor/phpDocumentor/Converters/HTML/frames
HTMLframesConverter.inc
| From: | Greg Beaver | Date: | Mon, 01 May 2006 04:23:25 +0000 |
| Subject: | cvs: pear /PhpDocumentor/phpDocumentor/Converters/HTML/Smarty HTMLSmartyConverter.inc /PhpDocumentor/phpDocumentor/Converters/HTML/frames HTMLframesConverter.inc |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-39923@lists.php.net to get a copy of this message | ||
cellog Mon May 1 04:23:25 2006 UTC
Modified files:
/pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty
HTMLSmartyConverter.inc
/pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames
HTMLframesConverter.inc
Log:
fix warning in Classes on generating class trees with parents in a different package
http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc?r1=1.10&r2=1.11&diff_format=u
Index: pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
diff -u pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.10
pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.11
--- pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc:1.10 Sun Apr 30
22:18:14 2006
+++ pear/PhpDocumentor/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc Mon May 1
04:23:25 2006
@@ -32,7 +32,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2000-2006 Joshua Eichorn, Gregory Beaver
* @license http://www.opensource.org/licenses/lgpl-license.php
LGPL
- * @version CVS: $Id: HTMLSmartyConverter.inc,v 1.10 2006/04/30 22:18:14 cellog Exp $
+ * @version CVS: $Id: HTMLSmartyConverter.inc,v 1.11 2006/05/01 04:23:25 cellog Exp $
* @filesource
* @link http://www.phpdoc.org
* @link http://pear.php.net/PhpDocumentor
@@ -49,7 +49,7 @@
* @see parserDocBlock, parserInclude, parserPage, parserClass, parserDefine, parserFunction,
parserMethod, parserVar
* @author Greg Beaver <cellog@users.sourceforge.net>
* @since 1.0rc1
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
class HTMLSmartyConverter extends Converter
{
@@ -1386,7 +1386,8 @@
else
{
// debug("parent
".$this->returnSee($tree[$cur]['parent'])." in other package");
- $root = $this->classes->getClassByPackage($tree[$cur]['parent'],
$package);
+ $root =
$this->classes->getClassByPackage($tree[$cur]['parent']->name,
+ $package);
$my_tree .= '<li>' .
$this->returnSee($tree[$cur]['parent']);
if ($tree[$cur]['parent']->package != $package) $my_tree .= '
<b>(Different package)</b><ul>';
}
http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc?r1=1.11&r2=1.12&diff_format=u
Index: pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
diff -u pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.11
pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.12
--- pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc:1.11 Sun Apr 30
22:18:14 2006
+++ pear/PhpDocumentor/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc Mon May 1
04:23:25 2006
@@ -31,7 +31,7 @@
* @author Gregory Beaver <cellog@php.net>
* @copyright 2002-2006 Gregory Beaver
* @license http://www.opensource.org/licenses/lgpl-license.php
LGPL
- * @version CVS: $Id: HTMLframesConverter.inc,v 1.11 2006/04/30 22:18:14 cellog Exp $
+ * @version CVS: $Id: HTMLframesConverter.inc,v 1.12 2006/05/01 04:23:25 cellog Exp $
* @filesource
* @link http://www.phpdoc.org
* @link http://pear.php.net/PhpDocumentor
@@ -48,7 +48,7 @@
* @see parserDocBlock, parserInclude, parserPage, parserClass, parserDefine, parserFunction,
parserMethod, parserVar
* @author Greg Beaver <cellog@users.sourceforge.net>
* @since 1.2
- * @version $Id: HTMLframesConverter.inc,v 1.11 2006/04/30 22:18:14 cellog Exp $
+ * @version $Id: HTMLframesConverter.inc,v 1.12 2006/05/01 04:23:25 cellog Exp $
*/
class HTMLframesConverter extends Converter
{
@@ -1334,7 +1334,8 @@
else
{
// debug("parent
".$this->returnSee($tree[$cur]['parent'])." in other package");
- $root = $this->classes->getClassByPackage($tree[$cur]['parent'],
$package);
+ $root =
$this->classes->getClassByPackage($tree[$cur]['parent']->name,
+ $package);
$my_tree .= '<li>' .
$this->returnSee($tree[$cur]['parent']);
if ($tree[$cur]['parent']->package != $package) $my_tree .= '
<b>(Different package)</b><ul>';
}