Changeset 1141

Show
Ignore:
Timestamp:
10/29/08 23:34:00 (2 months ago)
Author:
laurentj
Message:

ticket #134: added a plugin to display a constant inside a template

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/manifests/jelix-lib.mn

    r1118 r1141  
    449449  block.formsubmits.php 
    450450  block.ifctrl.php 
     451  cfunction.const.php 
    451452  function.ctrl_control.php 
    452453  function.ctrl_label.php 
    …… 
    471472 
    472473cd lib/jelix/plugins/tpl/text 
     474  cfunction.const.php 
    473475  function.jlocale.php 
    474476  function.jurl.php 
    …… 
    476478 
    477479cd lib/jelix/plugins/tpl/xml 
     480  cfunction.const.php 
    478481  function.jlocale.php 
    479482  function.jurl.php 
    …… 
    481484 
    482485cd lib/jelix/plugins/tpl/xul 
     486  cfunction.const.php 
    483487  function.jlocale.php 
    484488  function.jurl.php 

  • trunk/lib/jelix/plugins/tpl/common/cfunction.include.php

    r1026 r1141  
    1  <?php 
     1<?php 
    22/** 
    33 * Plugin from smarty project and adapted for jtpl 
    …… 
    2727        return '$t->display('.$param[0].');'; 
    2828    }else{ 
    29         $compiler->doError2('errors.tplplugin.cfunction.bad.argument.number','zone','1'); 
     29        $compiler->doError2('errors.tplplugin.cfunction.bad.argument.number','include','1'); 
    3030        return ''; 
    3131    } 
    3232} 
    33  
    34  

  • trunk/testapp/modules/jelix_tests/tests/jtpl.compiler.html_cli.php

    r1112 r1141  
    139139          '<?php for($t->_vars[\'i\']=count($t->_vars[\'o\']);$t->_vars[\'i\']<$t->_vars[\'p\'];$t->_vars[\'i\']++):?> A <?php endfor;?>' 
    140140         ), 
    141  
     14123=>array( 
     142        '<p>ok {const $foo}</p>', 
     143        '<p>ok <?php echo htmlspecialchars(constant($t->_vars[\'foo\']));?></p>', 
     144        ), 
    142145    ); 
    143146 
    …… 
    271274         0=>array('{for $i=count($a);$i<$p;$i++} A {/for}', 
    272275                  'jelix~errors.tpl.tag.character.invalid',array('for $i=count($a);$i<$p;$i++','(',null) ), 
     276         1=>array('{const \'fff\'}', 
     277                  'jelix~errors.tplplugin.untrusted.not.available',array('const',null) ), 
    273278    ); 
    274279    function testCompileErrorsUntrusted() { 
Download in other formats: Unified Diff Zip Archive