@@ -2,7 +2,7 @@ class HTMLScript_PXHTMLNode extends PXHTMLNode { public function getMatchXPath() { - return '//html:script'; + return '//script'; } public function handleMatch($node) { apps/chippino/template/classes/node/html/script.php @@ -8,6 +8,7 @@ class MetalPxhtmlIsMacro_PXHTMLNode extends PXHTMLNode { // remove attr public function handleMatch($node) { $node->removeAttribute('metal:pxhtml-is-macro'); + $node->removeAttribute('metal:pxhtml-macro-id'); } } apps/chippino/template/classes/node/metal/pxhtmlismacro.php @@ -21,7 +21,6 @@ if (!class_exists('PXHTML')) { } $core = chipi('#Chippino/Config')->with()->core; -$doctype = (isset($core['doctype'])) ? $core['doctype'] : NULL; $cache = (isset($core['template_cache'])) ? $core['template_cache'] : NULL; $file = chip($this->route)->getFilePath().'.php'; $chk = md5(file_get_contents($file)); @@ -32,12 +31,14 @@ if (file_exists($cache_file)) { return include $cache_file; } -$content = PXHTML::parse($file, $doctype); +$content = PXHTML::parse($file, null); file_put_contents('/tmp/'.$chk.'.php', $content); ob_start(); include '/tmp/'.$chk.'.php'; -ob_end_flush(); +$output = trim(ob_get_contents()); +ob_end_clean(); +echo $output; // var_dump($content); exit; apps/chippino/template/init.php 3f85aba338750f84f20f941267d1b70fbaa50034 Jakob Heuser jakob@felocity.org http://github.com/Jakobo/chippino/commit/1abfc8f8e0af7fc5d7aff93476612a0df4e5ea83 1abfc8f8e0af7fc5d7aff93476612a0df4e5ea83 2009-07-08T02:09:21-07:00 2009-07-08T02:09:21-07:00 cleans up stray markup left from the transformation process and removes the doctype dependency 8aeaebb00ddf1adb92bf0beadc3e892868c2b1ed Jakob Heuser jakob@felocity.org