summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-10-23 00:52:29 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-10-23 00:52:29 +0200
commitf14ecff9bdd949b2aa3ea4f8e041f3366896d93d (patch)
tree33543955eaf88fb19612998d7a870213ec2ae97d /system
parent0de51d86dbae3c640b961203afa588684ace421c (diff)
Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index 011d9598a..e276a0d07 100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
@@ -158,7 +158,7 @@ class CI_Parser {
*/
function _match_pair($string, $variable)
{
- if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match))
+ if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+?)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match))
{
return FALSE;
}