From 718cddc89e3b4901a641e175e86b4208436f2089 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 20 Jan 2013 20:32:33 -0500 Subject: Fixes #4991 CLI allowed when walled garden is turned on --- CHANGES.txt | 8 ++++++-- engine/classes/ElggSite.php | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 8687b3d2a..105d60f72 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,12 +2,16 @@ Version 1.8.13 (January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8) Contributing Developers: * Cash Costello - * Cristo Rabani + * Kevin Jardine + * Krzysztof Różalski Security Fixes: + Bugfixes: + * CLI usages with walled garden fixed + Enhancements: - * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) + * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) Version 1.8.12 diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index f7f5b68ea..1fe49b85c 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -362,6 +362,11 @@ class ElggSite extends ElggEntity { public function checkWalledGarden() { global $CONFIG; + // command line calls should not invoke the walled garden check + if (PHP_SAPI === 'cli') { + return; + } + if ($CONFIG->walled_garden) { if ($CONFIG->default_access == ACCESS_PUBLIC) { $CONFIG->default_access = ACCESS_LOGGED_IN; -- cgit v1.2.3