aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-26 06:24:46 -0700
committerCash Costello <cash.costello@gmail.com>2011-06-26 06:24:46 -0700
commit33f5c59d5318bc1e9a607215a31e48c6f7ab5b29 (patch)
treef519afd28b7d9c5d03d078c3afd1a3a77c5b45a4 /engine
parentf3240e1da73d4a89e379c0c34f8ce86f460e18dc (diff)
parent9ab2a7f6ea6650fcbbb20f9d0dd207de2d58b286 (diff)
downloadelgg-33f5c59d5318bc1e9a607215a31e48c6f7ab5b29.tar.gz
elgg-33f5c59d5318bc1e9a607215a31e48c6f7ab5b29.tar.bz2
Merge pull request #41 from cash/embed-lightbox
Fixes #3564 Embed rewrite using new lightbox
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/actions.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index ff598916f..4ccffd267 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -384,7 +384,8 @@ function actions_init() {
*/
function elgg_is_xhr() {
return isset($_SERVER['HTTP_X_REQUESTED_WITH'])
- && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest';
+ && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ||
+ get_input('X-Requested-With') === 'XMLHttpRequest';
}
/**