diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc --- PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc.patch 2011-12-03 22:40:10.000000000 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc 2012-11-25 16:11:24.100433853 +0100 @@ -168,7 +168,7 @@ class CHMdefaultConverter extends Conver $templ->assign('source_loc',$pathinfo['source_loc']); $templ->assign('docs',$pathinfo['docs']); $templ->assign("subdir",'../'); - $templ->register_outputfilter('CHMdefault_outputfilter'); + $templ->registerFilter('output', 'CHMdefault_outputfilter'); $this->setTargetDir($this->getFileSourcePath($this->base_dir)); $this->addSourceTOC($pathinfo['name'],$this->getFileSourceName($path),$pathinfo['package'],$pathinfo['subpackage'], true); phpDocumentor_out("\n"); @@ -188,7 +188,7 @@ class CHMdefaultConverter extends Conver $templ->assign('title',$title); $templ->assign('file',$path); $templ->assign("subdir",'../'); - $templ->register_outputfilter('CHMdefault_outputfilter'); + $templ->registerFilter('output', 'CHMdefault_outputfilter'); $pathinfo = $this->proceduralpages->getPathInfo($path, $this); $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource'); $this->addSourceTOC($title,'exsource_'.$path,$pathinfo['package'],$pathinfo['subpackage'], false); @@ -349,7 +349,7 @@ class CHMdefaultConverter extends Conver } $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->class_dir); $this->class_data->assign("subdir",$a); - $this->class_data->register_outputfilter('CHMdefault_outputfilter'); + $this->class_data->registerFilter('output', 'CHMdefault_outputfilter'); $this->addTOC($this->class,$this->class,$this->package,$this->subpackage, true); $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl')); unset($this->class_data); @@ -369,7 +369,7 @@ class CHMdefaultConverter extends Conver $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->page_dir); $this->page_data->assign("package",$this->package); $this->page_data->assign("subdir",$a); - $this->page_data->register_outputfilter('CHMdefault_outputfilter'); + $this->page_data->registerFilter('output', 'CHMdefault_outputfilter'); $this->addTOC($this->curpage->file,$this->page,$this->package,$this->subpackage); $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl')); unset($this->page_data); @@ -405,7 +405,7 @@ class CHMdefaultConverter extends Conver $template->assign("letters",$mletters[$package_indexes[$i]['package']]); $template->assign("title","Package ".$package_indexes[$i]['package']." Element Index"); $template->assign("subdir",'../'); - $template->register_outputfilter('CHMdefault_outputfilter'); + $template->registerFilter('output', 'CHMdefault_outputfilter'); $this->setTargetDir($this->base_dir . PATH_DELIMITER . $package_indexes[$i]['package']); $this->addTOC($package_indexes[$i]['package']." Alphabetical Index",'elementindex_'.$package_indexes[$i]['package'],$package_indexes[$i]['package'],''); $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl')); @@ -433,7 +433,7 @@ class CHMdefaultConverter extends Conver $template->assign("letters",$mletters); $template->assign("title","Element Index"); $template->assign("date",date("r",time())); - $template->register_outputfilter('CHMdefault_outputfilter'); + $template->registerFilter('output', 'CHMdefault_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -497,7 +497,7 @@ class CHMdefaultConverter extends Conver $template->assign("date",date("r",time())); $template->assign("title",$this->title); $template->assign("package",$key); - $template->register_outputfilter('CHMdefault_outputfilter'); + $template->registerFilter('output', 'CHMdefault_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -539,7 +539,7 @@ class CHMdefaultConverter extends Conver $template->assign("classtrees",$this->generateFormattedClassTrees($package)); $template->assign("package",$package); $template->assign("date",date("r",time())); - $template->register_outputfilter('CHMdefault_outputfilter'); + $template->registerFilter('output', 'CHMdefault_outputfilter'); $this->addTOC("$package Class Trees","classtrees_$package",$package,''); $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl')); phpDocumentor_out("\n"); @@ -665,7 +665,7 @@ class CHMdefaultConverter extends Conver } $templ = &$this->newSmarty(); $templ->assign('todos',$todolist); - $templ->register_outputfilter('CHMdefault_outputfilter'); + $templ->registerFilter('output', 'CHMdefault_outputfilter'); $this->setTargetDir($this->base_dir); $this->addTOC('Todo List','todolist','Index','',false,true); $this->addKLink('Todo List', 'todolist', '', 'Development'); @@ -799,7 +799,7 @@ class CHMdefaultConverter extends Conver $a = '../'; if ($element->subpackage) $a .= '../'; $template->assign('subdir',$a); - $template->register_outputfilter('CHMdefault_outputfilter'); + $template->registerFilter('output', 'CHMdefault_outputfilter'); $contents = $template->fetch('tutorial.tpl'); if ($element->package == $GLOBALS['phpDocumentor_DefaultPackageName'] && empty($element->subpackage) && ($element->name == $element->package . '.pkg')) { @@ -1895,6 +1895,6 @@ function CHMdefault_lettersort($a, $b) /** @access private */ function CHMdefault_outputfilter($src, &$smarty) { - return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src); + return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src); } ?> diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl.patch 2012-11-25 16:22:31.006750100 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl 2012-11-25 16:22:41.364754049 +0100 @@ -10,5 +10,5 @@ {/if} {/section}<br> <a href="elementindex.html"><b>Index of all elements</b></a><br> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc.patch 2011-12-03 22:40:11.000000000 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc 2012-11-25 16:11:24.102433855 +0100 @@ -166,7 +166,7 @@ class HTMLframesConverter extends Conver $templ->assign('source_loc',$pathinfo['source_loc']); $templ->assign('docs',$pathinfo['docs']); $templ->assign("subdir",'../'); - $templ->register_outputfilter('HTMLframes_outputfilter'); + $templ->registerFilter('output', 'HTMLframes_outputfilter'); $this->setTargetDir($this->getFileSourcePath($this->base_dir)); phpDocumentor_out("\n"); $this->setSourcePaths($path); @@ -185,7 +185,7 @@ class HTMLframesConverter extends Conver $templ->assign('title',$title); $templ->assign('file',$path); $templ->assign("subdir",'../'); - $templ->register_outputfilter('HTMLframes_outputfilter'); + $templ->registerFilter('output', 'HTMLframes_outputfilter'); $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource'); phpDocumentor_out("\n"); $this->writefile('exsource_'.$path.'.html',$templ->fetch('examplesource.tpl')); @@ -343,7 +343,7 @@ class HTMLframesConverter extends Conver } $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->class_dir); $this->class_data->assign("subdir",$a); - $this->class_data->register_outputfilter('HTMLframes_outputfilter'); + $this->class_data->registerFilter('output', 'HTMLframes_outputfilter'); $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl')); unset($this->class_data); } @@ -362,7 +362,7 @@ class HTMLframesConverter extends Conver $this->setTargetDir($this->base_dir . PATH_DELIMITER . $this->page_dir); $this->page_data->assign("package",$this->package); $this->page_data->assign("subdir",$a); - $this->page_data->register_outputfilter('HTMLframes_outputfilter'); + $this->page_data->registerFilter('output', 'HTMLframes_outputfilter'); $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl')); unset($this->page_data); } @@ -605,7 +605,7 @@ class HTMLframesConverter extends Conver $template->assign("index",$package_indexes[$i]['pindex']); $template->assign("package",$package_indexes[$i]['package']); $template->assign("letters",$mletters[$package_indexes[$i]['package']]); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); $this->setTargetDir($this->base_dir); $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl')); } @@ -630,7 +630,7 @@ class HTMLframesConverter extends Conver $template = &$this->newSmarty(); $template->assign("index",$elindex); $template->assign("letters",$mletters); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -655,7 +655,7 @@ class HTMLframesConverter extends Conver $index->assign("date",date("r",time())); $index->assign("title",$this->title); $index->assign("start","li_$start.html"); - $index->register_outputfilter('HTMLframes_outputfilter'); + $index->registerFilter('output', 'HTMLframes_outputfilter'); if (isset($this->tutorials[$start]['']['pkg'][$start . '.pkg'])) { $index->assign("blank",$start.'/tutorial_'.$start.'.pkg'); @@ -687,7 +687,7 @@ class HTMLframesConverter extends Conver } } $package->assign("packages",$this->package_index); - $package->register_outputfilter('HTMLframes_outputfilter'); + $package->registerFilter('output', 'HTMLframes_outputfilter'); $this->writefile("packages.html",$package->fetch('top_frame.tpl')); unset($index); } @@ -701,7 +701,7 @@ class HTMLframesConverter extends Conver $template->assign("date",date("r",time())); $template->assign("title",$this->title); $template->assign("package",$key); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -745,7 +745,7 @@ class HTMLframesConverter extends Conver $template->assign('todolink','todolist.html'); $template->assign("classtreepage","classtrees_$package"); $template->assign("elementindex","elementindex_$package"); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); if (isset($this->package_pages[$package])) { $template->assign("packagedoc",$package.'/package_' . $package . '.html'); @@ -760,7 +760,7 @@ class HTMLframesConverter extends Conver $template->assign("classtrees",$this->generateFormattedClassTrees($package)); $template->assign("interfaces",$this->generateFormattedInterfaceTrees($package)); $template->assign("package",$package); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl')); phpDocumentor_out("\n"); flush(); @@ -900,7 +900,7 @@ class HTMLframesConverter extends Conver } $templ = &$this->newSmarty(); $templ->assign('todos',$todolist); - $templ->register_outputfilter('HTMLframes_outputfilter'); + $templ->registerFilter('output', 'HTMLframes_outputfilter'); $this->setTargetDir($this->base_dir); $this->writefile('todolist.html',$templ->fetch('todolist.tpl')); } @@ -1011,7 +1011,7 @@ class HTMLframesConverter extends Conver $a = '../'; if ($element->subpackage) $a .= '../'; $template->assign('subdir',$a); - $template->register_outputfilter('HTMLframes_outputfilter'); + $template->registerFilter('output', 'HTMLframes_outputfilter'); $contents = $template->fetch('tutorial.tpl'); $a = ''; if ($element->subpackage) $a = PATH_DELIMITER . $element->subpackage; @@ -1901,6 +1901,6 @@ function HTMLframes_lettersort($a, $b) /** @access private */ function HTMLframes_outputfilter($src, &$smarty) { - return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src); + return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src); } ?> diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/default/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/default/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/default/templates/pkgelementindex.tpl.patch 2012-11-25 16:21:12.812717157 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/default/templates/pkgelementindex.tpl 2012-11-25 16:21:23.385721247 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/pkgelementindex.tpl.patch 2012-11-25 16:23:23.944771565 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/pkgelementindex.tpl 2012-11-25 16:23:34.374775584 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/pkgelementindex.tpl.patch 2012-11-25 16:23:46.073780259 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/pkgelementindex.tpl 2012-11-25 16:23:53.518783166 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/pkgelementindex.tpl.patch 2012-11-25 16:24:03.594788090 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/pkgelementindex.tpl 2012-11-25 16:24:14.065792468 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/pkgelementindex.tpl.patch 2012-11-25 16:24:26.172797719 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/pkgelementindex.tpl 2012-11-25 16:24:35.856801582 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/pkgelementindex.tpl.patch 2012-11-25 16:24:49.595807264 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/pkgelementindex.tpl 2012-11-25 16:25:03.073812573 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/pkgelementindex.tpl.patch 2012-11-25 16:25:13.490817474 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/pkgelementindex.tpl 2012-11-25 16:25:22.041823290 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/pkgelementindex.tpl.patch 2012-11-25 16:25:33.237828254 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/pkgelementindex.tpl 2012-11-25 16:25:44.738832416 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/pkgelementindex.tpl.patch 2012-11-25 16:25:51.821835627 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/pkgelementindex.tpl 2012-11-25 16:26:03.085840040 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/pkgelementindex.tpl.patch 2012-11-25 16:22:59.008760973 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/pkgelementindex.tpl 2012-11-25 16:23:07.925764379 +0100 @@ -13,5 +13,5 @@ </ul> <a href="elementindex.html"><strong>Index of all elements</strong></a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/pkgelementindex.tpl.patch 2012-11-25 16:26:17.077846379 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/pkgelementindex.tpl 2012-11-25 16:26:25.923849746 +0100 @@ -13,5 +13,5 @@ {/if} <a href="elementindex.html">All elements</a> <br /> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc.patch 2011-12-03 22:40:12.000000000 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc 2012-11-25 16:11:24.106433857 +0100 @@ -162,7 +162,7 @@ class HTMLSmartyConverter extends Conver $templ->assign('source_loc',$pathinfo['source_loc']); $templ->assign('docs',$pathinfo['docs']); $templ->assign("subdir",'../'); - $templ->register_outputfilter('HTMLSmarty_outputfilter'); + $templ->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->getFileSourcePath($this->base_dir)); phpDocumentor_out("\n"); $this->setSourcePaths($path); @@ -181,7 +181,7 @@ class HTMLSmartyConverter extends Conver $templ->assign('title',$title); $templ->assign('file',$path); $templ->assign("subdir",'../'); - $templ->register_outputfilter('HTMLSmarty_outputfilter'); + $templ->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->base_dir . PATH_DELIMITER . '__examplesource'); phpDocumentor_out("\n"); $this->writefile('exsource_'.$path.'.html',$templ->fetch('examplesource.tpl')); @@ -361,7 +361,7 @@ class HTMLSmartyConverter extends Conver $this->class_data->assign("packageindex",$this->package_index); $this->class_data->assign("package",$this->package); $this->class_data->assign("subdir",$a); - $this->class_data->register_outputfilter('HTMLSmarty_outputfilter'); + $this->class_data->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->writefile($this->class . '.html',$this->class_data->fetch('class.tpl')); unset($this->class_data); } @@ -536,7 +536,7 @@ class HTMLSmartyConverter extends Conver $this->page_data->assign("packageindex",$this->package_index); $this->page_data->assign("package",$this->package); $this->page_data->assign("subdir",$a); - $this->page_data->register_outputfilter('HTMLSmarty_outputfilter'); + $this->page_data->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->writefile($this->page . '.html',$this->page_data->fetch('page.tpl')); unset($this->page_data); } @@ -621,7 +621,7 @@ class HTMLSmartyConverter extends Conver $template->assign("letters",$mletters[$package_indexes[$i]['package']]); $template->assign("title","Package ".$package_indexes[$i]['package']." Element Index"); $template->assign("date",date("r",time())); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->base_dir); $this->writefile('elementindex_'.$package_indexes[$i]['package'].'.html',$template->fetch('pkgelementindex.tpl')); } @@ -657,7 +657,7 @@ class HTMLSmartyConverter extends Conver phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->writefile('elementindex.html',$template->fetch('elementindex.tpl')); usort($this->package_index,"HTMLSmarty_pindexcmp"); $index = &$this->newSmarty(); @@ -694,7 +694,7 @@ class HTMLSmartyConverter extends Conver { $index->assign("contents",$this->package_pages[$start]); } - $index->register_outputfilter('HTMLSmarty_outputfilter'); + $index->registerFilter('output', 'HTMLSmarty_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -716,7 +716,7 @@ class HTMLSmartyConverter extends Conver $template->assign("date",date("r",time())); $template->assign("title",$this->title); $template->assign("package",$key); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -761,7 +761,7 @@ class HTMLSmartyConverter extends Conver $template->assign("package",$package); $template->assign("date",date("r",time())); $template->assign("title","Class Trees for Package $package"); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->writefile("classtrees_$package.html",$template->fetch('classtrees.tpl')); phpDocumentor_out("\n"); flush(); @@ -914,7 +914,7 @@ class HTMLSmartyConverter extends Conver } $templ = &$this->newSmarty(); $templ->assign('todos',$todolist); - $templ->register_outputfilter('HTMLSmarty_outputfilter'); + $templ->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->base_dir); $this->writefile('todolist.html',$templ->fetch('todolist.tpl')); } @@ -979,7 +979,7 @@ class HTMLSmartyConverter extends Conver $template->assign("files",$allfiles); $template->assign("all",$out); $template->assign("title","phpDocumentor Parser Errors and Warnings"); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->base_dir); $this->writefile("errors.html",$template->fetch('errors.tpl')); unset($template); @@ -1020,7 +1020,7 @@ class HTMLSmartyConverter extends Conver $x = substr($x,strpos($x,'<body')); $template->assign("contents",trim(substr($x,strpos($x,'>') + 1))); $this->package_pages[$element->package] = trim(substr($x,strpos($x,'>') + 1)); - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); phpDocumentor_out("\n"); flush(); $this->setTargetDir($this->base_dir); @@ -1054,7 +1054,7 @@ class HTMLSmartyConverter extends Conver $template->assign("subdir",$a); $a = ''; if ($element->subpackage) $a = PATH_DELIMITER . $element->subpackage; - $template->register_outputfilter('HTMLSmarty_outputfilter'); + $template->registerFilter('output', 'HTMLSmarty_outputfilter'); $this->setTargetDir($this->base_dir . PATH_DELIMITER . $element->package . $a); $this->writeFile('tutorial_'.$element->name.'.html',$template->fetch('tutorial.tpl')); if ($element->name == $element->package . '.pkg') @@ -1954,6 +1954,6 @@ function HTMLSmarty_lettersort($a, $b) /** @access private */ function HTMLSmarty_outputfilter($src, &$smarty) { - return str_replace('{$subdir}',$smarty->_tpl_vars['subdir'],$src); + return str_replace('{$subdir}',$smarty->getTemplateVars('subdir'),$src); } ?> diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/pkgelementindex.tpl.patch 2012-11-25 16:18:29.366645103 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/pkgelementindex.tpl 2012-11-25 16:18:38.924648585 +0100 @@ -1,5 +1,5 @@ {include file="header.tpl"} <a name="top"></a> <h1>Element index for package {$package}</h1> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/pkgelementindex.tpl.patch 2012-11-25 16:13:15.542488972 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/pkgelementindex.tpl 2012-11-25 16:15:13.126530848 +0100 @@ -11,5 +11,5 @@ {/section} </ul> {/if} -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PEAR/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PEAR/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PEAR/templates/pkgelementindex.tpl.patch 2012-11-25 16:26:39.015857536 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PEAR/templates/pkgelementindex.tpl 2012-11-25 16:26:48.380861760 +0100 @@ -1,5 +1,5 @@ {include file="header.tpl"} <a name="top"></a> <h1>Element index for package {$package}</h1> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl --- PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl.patch 2011-12-03 22:40:12.000000000 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/pkgelementindex.tpl 2012-11-25 16:11:24.106433857 +0100 @@ -1,5 +1,5 @@ {include file="header.tpl"} <a name="top"></a> <h1>Element index for package {$package}</h1> -{include file="basicindex.tpl" indexname=elementindex_$package} +{include file="basicindex.tpl" indexname="elementindex_$package"} {include file="footer.tpl"} diff -up PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc.patch PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc --- PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc.patch 2011-12-03 22:40:12.000000000 +0100 +++ PhpDocumentor-1.4.4/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc 2012-11-25 16:11:24.107433859 +0100 @@ -1629,7 +1629,7 @@ class XMLDocBookpeardoc2Converter extend { foreach($ids as $id => $unll) { - if (!in_array($id, $templ->_tpl_vars['ids'])) + if (!in_array($id, $templ->getTemplateVars('ids'))) { $templ->append('ids',$id); }