diff options
| author | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-02 13:55:10 +0000 |
|---|---|---|
| committer | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-02 13:55:10 +0000 |
| commit | 53bb65495e51c4f57826968b82918637813aecaf (patch) | |
| tree | de9883f60a4e1efbd3290ab0f81dec4bf24835d7 | |
| parent | 67b314045b68e66cd33b250679eeebf3a427c8ce (diff) | |
| download | elgg-53bb65495e51c4f57826968b82918637813aecaf.tar.gz elgg-53bb65495e51c4f57826968b82918637813aecaf.tar.bz2 | |
Marcus Povey <marcus@dushka.co.uk>
* Minor bugfix
git-svn-id: https://code.elgg.org/elgg/trunk@769 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/elgglib.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index fc7627888..a185d8c4e 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1067,18 +1067,21 @@ if ($include_subdirs) { if (strpos($call['file'], $path) === 0) { + if ($strict_mode) { - if ($callstack[1] === $call) return true; + if ($callstack[1] === $call) { return true; } } else + { return true; + } } } else { if (strcmp($path, $call['file'])==0) if ($strict_mode) { - if ($callstack[2] === $call) return true; + if ($callstack[1] === $call) return true; } else return true; } @@ -1087,7 +1090,7 @@ } if ($CONFIG->debug) - system_message("Gatekeeper'd function called from {$callstack[2]['file']}:{$callstack[2]['line']}\n\nStack trace:\n\n" . print_r($callstack, true)); + system_message("Gatekeeper'd function called from {$callstack[1]['file']}:{$callstack[1]['line']}\n\nStack trace:\n\n" . print_r($callstack, true)); return false; } |