aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-02 22:40:22 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-02 22:40:22 +0000
commit4200625c681b343c30a83627b70c3104e40b2211 (patch)
treed0e0198fdb73bac62ab16940ad928ee1041a29ae
parent7fa7ef10e5969df7a9faf5b51deb65179c169969 (diff)
downloadelgg-4200625c681b343c30a83627b70c3104e40b2211.tar.gz
elgg-4200625c681b343c30a83627b70c3104e40b2211.tar.bz2
Refs #2490. Using array_key_exists() instead of isset() in get() overrides to prevent a check for (invalid) metadata with the name of an attribute if that attribute evaluates to !isset().
git-svn-id: http://code.elgg.org/elgg/trunk@7815 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/classes/ElggEntity.php2
-rw-r--r--engine/classes/ElggExtender.php2
-rw-r--r--engine/classes/ElggRelationship.php2
-rw-r--r--engine/classes/ElggWidget.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index fb80673dc..100d882e5 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -167,7 +167,7 @@ abstract class ElggEntity extends ElggData implements
*/
public function get($name) {
// See if its in our base attributes
- if (isset($this->attributes[$name])) {
+ if (array_key_exists($name, $this->attributes)) {
return $this->attributes[$name];
}
diff --git a/engine/classes/ElggExtender.php b/engine/classes/ElggExtender.php
index 6ab9ff3ce..d6f79d18d 100644
--- a/engine/classes/ElggExtender.php
+++ b/engine/classes/ElggExtender.php
@@ -33,7 +33,7 @@ abstract class ElggExtender extends ElggData
* @return mixed
*/
protected function get($name) {
- if (isset($this->attributes[$name])) {
+ if (array_key_exists($name, $this->attributes)) {
// Sanitise value if necessary
if ($name == 'value') {
switch ($this->attributes['value_type']) {
diff --git a/engine/classes/ElggRelationship.php b/engine/classes/ElggRelationship.php
index 50a86fff1..0faaf875e 100644
--- a/engine/classes/ElggRelationship.php
+++ b/engine/classes/ElggRelationship.php
@@ -41,7 +41,7 @@ class ElggRelationship extends ElggData implements
* @return mixed
*/
function get($name) {
- if (isset($this->attributes[$name])) {
+ if (array_key_exists($name, $this->attributes)) {
return $this->attributes[$name];
}
diff --git a/engine/classes/ElggWidget.php b/engine/classes/ElggWidget.php
index 60f2b6be4..913dfc2ba 100644
--- a/engine/classes/ElggWidget.php
+++ b/engine/classes/ElggWidget.php
@@ -30,7 +30,7 @@ class ElggWidget extends ElggObject {
*/
public function get($name) {
// See if its in our base attribute
- if (isset($this->attributes[$name])) {
+ if (array_key_exists($name, $this->attributes)) {
return $this->attributes[$name];
}