aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-09-13 09:52:50 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-09-13 09:52:50 -0500
commit8b2653dae361506c46ffcdf8db90734421a3cbc7 (patch)
tree15b068b110d4faadbe03d7804de81bb4b4e6a3ad /phpBB/phpbb
parentaa710df2db2512f6065f91dcf8b5fc7d100edf41 (diff)
parent958f3e950309c6275ae2872ce9c29c89303cf7be (diff)
downloadforums-8b2653dae361506c46ffcdf8db90734421a3cbc7.tar
forums-8b2653dae361506c46ffcdf8db90734421a3cbc7.tar.gz
forums-8b2653dae361506c46ffcdf8db90734421a3cbc7.tar.bz2
forums-8b2653dae361506c46ffcdf8db90734421a3cbc7.tar.xz
forums-8b2653dae361506c46ffcdf8db90734421a3cbc7.zip
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By David King # Via David King (1) and Joas Schilling (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11824] Fix comment wording
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/controller/helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 3f6ef24ce0..50bbad5fce 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -109,7 +109,7 @@ class phpbb_controller_helper
$route = substr($route, 0, $route_delim);
}
- // If enable_mod_rewrite is false, we not need to include app.php
+ // If enable_mod_rewrite is false, we need to include app.php
$route_prefix = $this->phpbb_root_path;
if (empty($this->config['enable_mod_rewrite']))
{