fix(core): elgg_get_plugin_setting() respects defaults for values tha…

…t haven't been cached or created. Fixes #9781
Elgg · May 6, 2016 · 1e141d4 · 1e141d4
1 parent b2bc2b9
commit 1e141d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
@@ -276,8 +276,9 @@ public function setPriority($priority, $site_guid = null) {
 	 */
 	public function getSetting($name, $default = null) {
 		$values = _elgg_services()->pluginSettingsCache->getAll($this->guid);
+
 		if ($values !== null) {
-			return isset($values[$name]) ? $values[$name] : null;
+			return isset($values[$name]) ? $values[$name] : $default;
 		}
 
 		$val = $this->$name;

diff --git a/engine/tests/ElggCorePluginsAPITest.php b/engine/tests/ElggCorePluginsAPITest.php
@@ -260,4 +260,22 @@ public function testElggPluginGetID() {
 
 		$this->assertIdentical('profile', $test_plugin->getID());
 	}
+
+	public function testGetSettingRespectsDefaults() {
+		$plugin = elgg_get_plugin_from_id('profile');
+		if (!$plugin) {
+			return;
+		}
+
+		$cache = _elgg_services()->pluginSettingsCache;
+		$cache->setCachedValues([
+			$plugin->guid => [
+				__METHOD__ => 'foo',
+			],
+		]);
+
+		$this->assertEqual('foo', $plugin->getSetting(__METHOD__, 'bar'));
+		$cache->clearAll();
+		$this->assertEqual('bar', $plugin->getSetting(__METHOD__, 'bar'));
+	}
 }