Update of /cvsroot/phpwebapp/web_app/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19096/parser
Modified Files:
class.Template.php class.Render.php class.Parser.php
Log Message:
Index: class.Template.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Template.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.Template.php 22 Jul 2004 16:25:37 -0000 1.13
--- class.Template.php 29 Jul 2004 14:46:54 -0000 1.14
***************
*** 114,118 ****
//remove any empty lines in the end
! $str = preg_replace('/\n\s*$/', '', $str);
//Trim the indentation from the beginning of each line.
--- 114,118 ----
//remove any empty lines in the end
! $str = preg_replace('/\n\s*$/', "\n", $str);
//Trim the indentation from the beginning of each line.
Index: class.Render.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Render.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.Render.php 28 Jul 2004 14:26:55 -0000 1.16
--- class.Render.php 29 Jul 2004 14:46:54 -0000 1.17
***************
*** 70,73 ****
--- 70,74 ----
$this->output($str);
}
+
/** Make some extra processing and replacements in the output. */
function other_replaces($str)
Index: class.Parser.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/parser/class.Parser.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.Parser.php 28 Jul 2004 14:26:55 -0000 1.18
--- class.Parser.php 29 Jul 2004 14:46:54 -0000 1.19
***************
*** 691,694 ****
--- 691,697 ----
{
$tpl = new Template;
+ $file = $this->files[sizeof($this->files)-1];
+ $url = WebApp::to_url(dirname($file).'/');
+ $tpl->addVar('./', "'$url'");
$this->push_current_tpl($tpl);
}
***************
*** 724,727 ****
--- 727,733 ----
{
$tpl = new Template;
+ $file = $this->files[sizeof($this->files)-1];
+ $url = WebApp::to_url(dirname($file).'/');
+ $tpl->addVar('./', "'$url'");
$this->push_current_tpl($tpl);
}
|
