aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 15:11:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-05 15:11:05 +0000
commit5571ca5b350fd1735f13af7ddfbb88afa6befb0c (patch)
treef8f2c4e1705a3edd6ec5d759f188926f7495021c /engine/lib
parent394f52f0ef0d743cb50352fce14020837662d891 (diff)
downloadelgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.gz
elgg-5571ca5b350fd1735f13af7ddfbb88afa6befb0c.tar.bz2
Merged 5487:5525 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5621 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/entities.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index e3fa0cb52..3d16e1b3d 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -146,6 +146,8 @@ abstract class ElggEntity implements
$this->attributes['guid'] = "";
+ $this->attributes['subtype'] = $orig_entity->getSubtype();
+
// copy metadata over to new entity - slightly convoluted due to
// handling of metadata arrays
if (is_array($metadata_array)) {
@@ -204,8 +206,6 @@ abstract class ElggEntity implements
* A: Because overload operators cause problems during subclassing, so we put the code here and
* create overloads in subclasses.
*
- * @todo Move "title" logic to applicable extending classes.
- *
* @param string $name
* @param mixed $value
*/
@@ -216,11 +216,6 @@ abstract class ElggEntity implements
return false;
}
- // strip out tags from title
- if ($name == 'title') {
- $value = strip_tags($value);
- }
-
$this->attributes[$name] = $value;
}
else {