smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #349 from ka7/feature/spelling

Browse Source 
spelling fixes
This commit is contained in:
uwetews
2017-04-14 14:37:18 +02:00
committed by GitHub
parent 00974d74b8 51a0e764e8
commit ec9fd99684
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INHERITANCE_RELEASE_NOTES.txt
View File

@@ -63,7 +63,7 @@ the compiled code of {include} subtemplates gets also merged in compiled inherit
Merging the code into a single compile template has some drawbacks. Merging the code into a single compile template has some drawbacks.
1. You could not use variable file names in {include} Smarty would use the {include} of compilation time. 1. You could not use variable file names in {include} Smarty would use the {include} of compilation time.
2. You could not use individual compile_id in {include} 2. You could not use individual compile_id in {include}
3. Seperate caching of subtemplate was not possible 3. Separate caching of subtemplate was not possible
4. Any change of the template directory structure between calls was not necessarily seen. 4. Any change of the template directory structure between calls was not necessarily seen.
Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out

2
NEW_FEATURES.txt
View File

@@ -45,7 +45,7 @@ Smarty 3.1.30
{/foreach} {/foreach}
The {foreach} loop is rendered while processing the compiled template, but $current is a nocache The {foreach} loop is rendered while processing the compiled template, but $current is a nocache
variable. Normally the {if $current==$item.id} would fail as the $item variable is unkown in the variable. Normally the {if $current==$item.id} would fail as the $item variable is unknown in the
cached template. {make_nocache $item} does make the current $item value known in thee cached template. cached template. {make_nocache $item} does make the current $item value known in thee cached template.
{make_nocache} is ignored when caching is disabled or the variable does exists as nocache variable. {make_nocache} is ignored when caching is disabled or the variable does exists as nocache variable.

10
README
View File

@@ -260,12 +260,12 @@ Example: {$object->method1($x)->method2($y)}
{for} tag added for looping (replacement for {section} tag): {for} tag added for looping (replacement for {section} tag):
{for $x=0, $y=count($foo); $x<$y; $x++} .... {/for} {for $x=0, $y=count($foo); $x<$y; $x++} .... {/for}
Any number of statements can be used separated by comma as the first Any number of statements can be used separated by comma as the first
inital expression at {for}. initial expression at {for}.
{for $x = $start to $end step $step} ... {/for}is in the SVN now . {for $x = $start to $end step $step} ... {/for}is in the SVN now .
You can use also You can use also
{for $x = $start to $end} ... {/for} {for $x = $start to $end} ... {/for}
In this case the step value will be automaticall 1 or -1 depending on the start and end values. In this case the step value will be automatically 1 or -1 depending on the start and end values.
Instead of $start and $end you can use any valid expression. Instead of $start and $end you can use any valid expression.
Inside the loop the following special vars can be accessed: Inside the loop the following special vars can be accessed:
$x@iteration = number of iteration $x@iteration = number of iteration
@@ -473,7 +473,7 @@ TEMPLATE INHERITANCE:
===================== =====================
With template inheritance you can define blocks, which are areas that can be With template inheritance you can define blocks, which are areas that can be
overriden by child templates, so your templates could look like this: overridden by child templates, so your templates could look like this:
parent.tpl: parent.tpl:
<html> <html>
@@ -508,8 +508,8 @@ grandchild.tpl:
We redefined all the blocks here, however in the title block we used {$smarty.block.parent}, We redefined all the blocks here, however in the title block we used {$smarty.block.parent},
which tells Smarty to insert the default content from the parent template in its place. which tells Smarty to insert the default content from the parent template in its place.
The content block was overriden to display the image files, and page-title has also be The content block was overridden to display the image files, and page-title has also be
overriden to display a completely different title. overridden to display a completely different title.
If we render grandchild.tpl we will get this: If we render grandchild.tpl we will get this:
<html> <html>

2
SMARTY_3.0_BC_NOTES.txt
View File

@@ -1,5 +1,5 @@
== Smarty2 backward compatibility == == Smarty2 backward compatibility ==
All Smarty2 specific API functions and deprecated functionallity has been moved All Smarty2 specific API functions and deprecated functionality has been moved
to the SmartyBC class. to the SmartyBC class.
== {php} Tag == == {php} Tag ==

4
SMARTY_3.1_NOTES.txt
View File

@@ -50,7 +50,7 @@ The escape modifier now knows the $double_encode option, which will
prevent entities from being encoded again. prevent entities from being encoded again.
The capitalize modifier now know the $lc_rest option, which makes sure The capitalize modifier now know the $lc_rest option, which makes sure
all letters following a captial letter are lower-cased. all letters following a capital letter are lower-cased.
The count_sentences modifier now accepts (.?!) as The count_sentences modifier now accepts (.?!) as
legitimate endings of a sentence - previously only (.) was legitimate endings of a sentence - previously only (.) was
@@ -126,7 +126,7 @@ run on variable output.
SYNTAX: SYNTAX:
{setfilter filter1|filter2|filter3....} {setfilter filter1|filter2|filter3....}
Smarty3 will lookup up matching filters in the following search order: Smarty3 will lookup up matching filters in the following search order:
1. varibale filter plugin in plugins_dir. 1. variable filter plugin in plugins_dir.
2. a valid modifier. A modifier specification will also accept 2. a valid modifier. A modifier specification will also accept
additional parameter like filter2:'foo' additional parameter like filter2:'foo'
3. a PHP function 3. a PHP function

2
demo/plugins/cacheresource.pdo.php
View File

@@ -91,7 +91,7 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
* *
* @param PDO $pdo PDO : active connection * @param PDO $pdo PDO : active connection
* @param string $table : table (or view) name * @param string $table : table (or view) name
* @param string $database : optionnal - if table is located in another db * @param string $database : optional - if table is located in another db
*/ */
public function __construct(PDO $pdo, $table, $database = null) public function __construct(PDO $pdo, $table, $database = null)
{ {

2
lexer/smarty_internal_templateparser.y
View File

@@ -1263,7 +1263,7 @@ arrayelement(res) ::= expr(e). {
// //
// double qouted strings // double quoted strings
// //
doublequoted_with_quotes(res) ::= QUOTE QUOTE. { doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
res = "''"; res = "''";

2
libs/plugins/function.mailto.php
View File

@@ -20,7 +20,7 @@
* * none : no encoding (default) * * none : no encoding (default)
* * javascript : encode with javascript * * javascript : encode with javascript
* * javascript_charcode : encode with javascript charcode * * javascript_charcode : encode with javascript charcode
* * hex : encode with hexidecimal (no javascript) * * hex : encode with hexadecimal (no javascript)
* - cc - (optional) - address(es) to carbon copy * - cc - (optional) - address(es) to carbon copy
* - bcc - (optional) - address(es) to blind carbon copy * - bcc - (optional) - address(es) to blind carbon copy
* - subject - (optional) - e-mail subject * - subject - (optional) - e-mail subject

2
libs/sysplugins/smarty_internal_compile_private_registered_function.php
View File

@@ -44,7 +44,7 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
} else { } else {
$tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ]; $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
} }
// not cachable? // not cacheable?
$compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ]; $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ];
// convert attributes into parameter array string // convert attributes into parameter array string
$_paramsArray = array(); $_paramsArray = array();

2
libs/sysplugins/smarty_internal_runtime_inheritance.php
View File

@@ -100,7 +100,7 @@ class Smarty_Internal_Runtime_Inheritance
* - if outer level is reached flush output buffer and switch to wait for parent template state * - if outer level is reached flush output buffer and switch to wait for parent template state
* *
* @param \Smarty_Internal_Template $tpl * @param \Smarty_Internal_Template $tpl
* @param null|string $template optinal name of inheritance parent template * @param null|string $template optional name of inheritance parent template
* @param null|string $uid uid of inline template * @param null|string $uid uid of inline template
* @param null|string $func function call name of inline template * @param null|string $func function call name of inline template
*/ */

2
libs/sysplugins/smarty_internal_runtime_updatescope.php
View File

@@ -82,7 +82,7 @@ class Smarty_Internal_Runtime_UpdateScope
} }
/** /**
* Update varibale in other scope * Update variable in other scope
* *
* @param array $tpl_vars template variable array * @param array $tpl_vars template variable array
* @param \Smarty_Internal_Template $from * @param \Smarty_Internal_Template $from