aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-04-23 21:52:04 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-04-23 21:52:04 +0200
commit513b95642eab7f8092d651a21045dc4bb1556148 (patch)
tree922037649ee0f126a84d1deec0b0f0d12f3faf25 /phpBB
parentca0a066854addfc557b7b6fb0c25deed2a3fe960 (diff)
parent8a97722464c1aa99f56c71abebc68b9565fdd29d (diff)
downloadforums-513b95642eab7f8092d651a21045dc4bb1556148.tar
forums-513b95642eab7f8092d651a21045dc4bb1556148.tar.gz
forums-513b95642eab7f8092d651a21045dc4bb1556148.tar.bz2
forums-513b95642eab7f8092d651a21045dc4bb1556148.tar.xz
forums-513b95642eab7f8092d651a21045dc4bb1556148.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10147] Corrected a typo in includes/functions_template.php.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index d3f9e0dda1..8c58c33b0d 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -322,7 +322,7 @@ class template_compile
// Is the designer wanting to call another loop in a loop?
if (strpos($tag_args, '!') === 0)
{
- // Count the number if ! occurrences (not allowed in vars)
+ // Count the number of ! occurrences (not allowed in vars)
$no_nesting = substr_count($tag_args, '!');
$tag_args = substr($tag_args, $no_nesting);
}