diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
| commit | a6507905578f1cf209776ae3d53099a005a06823 (patch) | |
| tree | 9f23bb557f920034cf65c86059c84e37efd34d79 /system/libraries/Parser.php | |
| parent | 60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff) | |
| parent | 25d495b4a2598f771a858108a2cd2e96f0130412 (diff) | |
merging in changes
Diffstat (limited to 'system/libraries/Parser.php')
| -rw-r--r-- | system/libraries/Parser.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index d223da020..f48f2a7e5 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * @@ -31,7 +31,7 @@ class CI_Parser { var $object; /** - * Parse a template + * Parse a template * * Parses pseudo-variables contained in the specified template view, * replacing them with the data in the second param @@ -53,7 +53,7 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Parse a String + * Parse a String * * Parses pseudo-variables contained in the specified string, * replacing them with the data in the second param @@ -72,7 +72,7 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Parse a template + * Parse a template * * Parses pseudo-variables contained in the specified template, * replacing them with the data in the second param @@ -114,7 +114,7 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Set the left/right variable delimiters + * Set the left/right variable delimiters * * @access public * @param string @@ -130,7 +130,7 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Parse a single key/value + * Parse a single key/value * * @access private * @param string @@ -146,9 +146,9 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Parse a tag pair + * Parse a tag pair * - * Parses tag pairs: {some_tag} string... {/some_tag} + * Parses tag pairs: {some_tag} string... {/some_tag} * * @access private * @param string @@ -188,7 +188,7 @@ class CI_Parser { // -------------------------------------------------------------------- /** - * Matches a variable pair + * Matches a variable pair * * @access private * @param string |