fix(upgrade): Corrected the way ignore access and show hidden entitie…

…s is applied
Elgg · Apr 7, 2014 · ccec25a · ccec25a
1 parent 3aae56b
commit ccec25a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/engine/lib/upgrades/2013010400-1.9.0_dev-comments_to_entities-faba94768b055b08.php b/engine/lib/upgrades/2013010400-1.9.0_dev-comments_to_entities-faba94768b055b08.php
@@ -18,6 +18,10 @@
 	add_subtype('object', 'comment', 'ElggComment');
 }
 
+$access_status = access_get_show_hidden_status();
+access_show_hidden_entities(true);
+$ia = elgg_set_ignore_access(true);
+
 // add ElggUpgrade object if need to migrate comments
 $options = array(
 	'annotation_names' => 'generic_comment',
@@ -26,13 +30,12 @@
 );
 
 if (elgg_get_annotations($options)) {
-	$ia = elgg_set_ignore_access(true);
-
 	$upgrade = new ElggUpgrade();
 	$upgrade->setURL("admin/upgrades/comments");
 	$upgrade->title = 'Comments Upgrade';
 	$upgrade->description = 'Comments have been improved in Elgg 1.9 and require a migration. Run this upgrade to complete the migration.';
 	$upgrade->save();
+}
 
-	elgg_set_ignore_access($ia);
-}
+elgg_set_ignore_access($ia);
+access_show_hidden_entities($access_status);
diff --git a/mod/groups/upgrades/2013100401.php b/mod/groups/upgrades/2013100401.php
@@ -12,7 +12,9 @@
  */
 
 $access_status = access_get_show_hidden_status();
+access_show_hidden_entities(true);
 $ia = elgg_set_ignore_access(true);
+
 $discussion_replies = elgg_get_annotations(array(
 	'annotation_names' => 'group_topic_post',
 ));