aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-08-01 16:27:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-08-01 16:27:06 +0000
commit5ed0be15abe090c426114240f06a01005edfefea (patch)
treecc56fdd8bf3a274e6eac21d907026c2bbeb5c4bf /phpBB/includes/functions.php
parent2ffdd92975cdacd7c12b5a438a62730ec02e6129 (diff)
downloadforums-5ed0be15abe090c426114240f06a01005edfefea.tar
forums-5ed0be15abe090c426114240f06a01005edfefea.tar.gz
forums-5ed0be15abe090c426114240f06a01005edfefea.tar.bz2
forums-5ed0be15abe090c426114240f06a01005edfefea.tar.xz
forums-5ed0be15abe090c426114240f06a01005edfefea.zip
some tiny fixes and two new features. ;)
git-svn-id: file:///svn/phpbb/trunk@7994 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index daff12e3a8..5632d78022 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1582,6 +1582,13 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
{
global $_SID, $_EXTRA_URL;
+ // 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
+ if (function_exists('append_sid_phpbb_hook'))
+ {
+ return append_sid_phpbb_hook($url, $params, $is_amp, $session_id);
+ }
+
// Assign sid if session id is not specified
if ($session_id === false)
{
@@ -4276,7 +4283,10 @@ function page_footer($run_cron = true)
garbage_collection();
- exit;
+ if (!defined('PHPBB_EMBEDDED'))
+ {
+ exit;
+ }
}
/**