aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-03-22 22:54:24 +0100
committerIgor Wiedler <igor@wiedler.ch>2010-03-22 22:54:24 +0100
commita5057c9f2568d30b413d4b14140f6ecaac6315d5 (patch)
treecc814e87b4fc2b0295a3c277bdf133b2cf834674 /phpBB/includes/functions.php
parentae48c8ee9ecf7866e4fe1ca4d3390d69a1adc2b4 (diff)
parentb3ff3be0dc56fdf32a7ae34b271b9016efa99c3b (diff)
downloadforums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.gz
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.bz2
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.tar.xz
forums-a5057c9f2568d30b413d4b14140f6ecaac6315d5.zip
Merge branch 'develop-olympus' into git-tools
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 917433a970..ce1f5f5462 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2139,8 +2139,8 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
{
global $_SID, $_EXTRA_URL, $phpbb_hook;
- // Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
- // They could mimick most of what is within this function
+ // Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropriately.
+ // They could mimic most of what is within this function
if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
{
if ($phpbb_hook->hook_return(__FUNCTION__))