cvs: phd(PHD_0_4) / mktoc.php package.xml /include PhDReader.class.php

bjori Sun Oct 19 16:40:53 2008 UTC Modified files: (Branch: PHD_0_4) /phd mktoc.php package.xml /phd/include PhDReader.class.php Log: MFH: Fixed bug#46252 (Class properties links to a function if theres one with the same name) http://cvs.php.net/viewvc.cgi/phd/mktoc.php?r1=1.10.2.1.2.3&r2=1.10.2.1.2.4&diff_format=u Index: phd/mktoc.php diff -u phd/mktoc.php:1.10.2.1.2.3 phd/mktoc.php:1.10.2.1.2.4 --- phd/mktoc.php:1.10.2.1.2.3 Sun Oct 19 14:49:40 2008 +++ phd/mktoc.php Sun Oct 19 16:40:53 2008 @@ -29,7 +29,7 @@ * PhDHelper::getRefnameLink(), and allows easy refname->link resolution. * * @package PhD -* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.3 2008/10/19 14:49:40 bjori Exp $ +* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.4 2008/10/19 16:40:53 bjori Exp $ */ $r = new PhDReader($OPTIONS); @@ -48,9 +48,12 @@ if (empty($IDs[$lastid]["sdesc"])) { if ($name == "refname") { $IDs[$lastid]["sdesc"] = $refname = trim($r->readContent($name)); - $ref = strtolower(str_replace(array("_", "::", "->"), array("-", "-", "-"), $refname)); - $REFS[$ref] = $lastid; - $VARS[$refname] = $lastid; + if ($r->getTagNameByDepth($r->depth-2) == "phpdoc:varentry") { + $VARS[$refname] = $lastid; + } else { + $ref = strtolower(str_replace(array("_", "::", "->"), array("-", "-", "-"), $refname)); + $REFS[$ref] = $lastid; + } continue; } else if ($name == "titleabbrev") { @@ -64,8 +67,11 @@ } else if ($name == "refname") { $refname = trim($r->readContent($name)); $ref = strtolower(str_replace(array("_", "::", "->"), array("-", "-", "-"), $refname)); - $REFS[$ref] = $lastid; - $VARS[$refname] = $lastid; + if ($r->getTagNameByDepth($r->depth-2) == "phpdoc:varentry") { + $VARS[$refname] = $lastid; + } else { + $REFS[$ref] = $lastid; + } } if (empty($IDs[$lastid]["ldesc"])) { if ($name == "title" || $name == "refpurpose") { http://cvs.php.net/viewvc.cgi/phd/package.xml?r1=1.74.2.19.2.3&r2=1.74.2.19.2.4&diff_format=u Index: phd/package.xml diff -u phd/package.xml:1.74.2.19.2.3 phd/package.xml:1.74.2.19.2.4 --- phd/package.xml:1.74.2.19.2.3 Sun Oct 19 14:03:36 2008 +++ phd/package.xml Sun Oct 19 16:40:53 2008 @@ -67,7 +67,8 @@ * qandadiv - Improved &lt;email&gt; support (now creates mailto: links). (Christian) - Chunks without xml:id are no longer chunked. (Christian) - - Fixed bug #46094 (and then from now on italic). (Hannes) + - Fixed bug#46094 (and then from now on italic). (Hannes) + - Fixed bug#46252 (Class properties links to a function if theres one with the same name). (Hannes) - Fixed a bug where it was only possible to pass one parameter to phd.bat. (Kalle) - Fixed a bug where it wasn't possible to have paths with spaces in when using phd.bat. (Kalle) - Fixed xhtml validation issue for itemizedlist. (Christian) http://cvs.php.net/viewvc.cgi/phd/include/PhDReader.class.php?r1=1.16.4.1&r2=1.16.4.2&diff_format=u Index: phd/include/PhDReader.class.php diff -u phd/include/PhDReader.class.php:1.16.4.1 phd/include/PhDReader.class.php:1.16.4.2 --- phd/include/PhDReader.class.php:1.16.4.1 Sun Oct 19 14:02:49 2008 +++ phd/include/PhDReader.class.php Sun Oct 19 16:40:53 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDReader.class.php,v 1.16.4.1 2008/10/19 14:02:49 bjori Exp $ */ +/* $Id: PhDReader.class.php,v 1.16.4.2 2008/10/19 16:40:53 bjori Exp $ */ //6271 class PhDReader extends XMLReader { @@ -113,6 +113,9 @@ public function getParentTagName() { /* {{{ */ return $this->STACK[$this->depth-1]; } /* }}} */ + public function getTagNameByDepth($depth) { /* {{{ */ + return $this->STACK[$depth]; + } /* }}} */ public function getPreviousSiblingTagName() { /* {{{ */ return $this->PREVIOUS_SIBLING; } /* }}} */