Merge branch 'lorea-preprod'

1 files changed, 11 insertions, 4 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 4875b2c2f..d950261a2 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -331,7 +331,7 @@ function remove_subtype($type, $subtype) {
 }
 
 /**
- * Update a registered ElggEntity type, subtype, and classname
+ * Update a registered ElggEntity type, subtype, and class name
  *
  * @param string $type    Type
  * @param string $subtype Subtype
@@ -340,7 +340,7 @@ function remove_subtype($type, $subtype) {
  * @return bool
  */
 function update_subtype($type, $subtype, $class = '') {
-	global $CONFIG;
+	global $CONFIG, $SUBTYPE_CACHE;
 
 	if (!$id = get_subtype_id($type, $subtype)) {
 		return FALSE;
@@ -348,10 +348,16 @@ function update_subtype($type, $subtype, $class = '') {
 	$type = sanitise_string($type);
 	$subtype = sanitise_string($subtype);
 
-	return update_data("UPDATE {$CONFIG->dbprefix}entity_subtypes
+	$result = update_data("UPDATE {$CONFIG->dbprefix}entity_subtypes
 		SET type = '$type', subtype = '$subtype', class = '$class'
 		WHERE id = $id
 	");
+
+	if ($result && isset($SUBTYPE_CACHE[$id])) {
+		$SUBTYPE_CACHE[$id]->class = $class;
+	}
+
+	return $result;
 }
 
 /**
@@ -1452,6 +1458,7 @@ function enable_entity($guid, $recursive = true) {
 						'relationship' => 'disabled_with',
 						'relationship_guid' => $entity->guid,
 						'inverse_relationship' => true,
+						'limit' => 0,
 					));
 
 					foreach ($disabled_with_it as $e) {
@@ -1767,7 +1774,7 @@ function import_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
 		if ($tmp) {
 			// Make sure its saved
 			if (!$tmp->save()) {
-				elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
+				$msg = elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
 				throw new ImportException($msg);
 			}