3 files changed, 16 insertions, 13 deletions

diff --git a/views/default/export/entity.php b/views/default/export/entity.php
index c2fd7f8b8..3064f1288 100644
--- a/views/default/export/entity.php
+++ b/views/default/export/entity.php
@@ -11,9 +11,12 @@ $entity = $vars['entity'];
 if (!$entity) {
 	throw new InvalidParameterException(elgg_echo('InvalidParameterException:NoEntityFound'));
 }
-
-$metadata = get_metadata_for_entity($entity->guid);
-$annotations = get_annotations($entity->guid);
+$options = array(
+	'guid' => $entity->guid,
+	'limit' => 0
+);
+$metadata = elgg_get_metadata($options);
+$annotations = elgg_get_annotations($options);
 $relationships = get_entity_relationships($entity->guid);
 
 $exportable_values = $entity->getExportableValues();
@@ -22,9 +25,9 @@ $exportable_values = $entity->getExportableValues();
 <h2><?php echo elgg_echo('Entity'); ?></h2>
 	<?php
 		foreach ($entity as $k => $v) {
-			if ((in_array($k, $exportable_values)) || (isadminloggedin())) {
+			if ((in_array($k, $exportable_values)) || (elgg_is_admin_logged_in())) {
 ?>
-			<p class="margin_none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p>
+			<p class="margin-none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p>
 <?php
 			}
 		}
@@ -32,12 +35,12 @@ $exportable_values = $entity->getExportableValues();
 </div>
 
 <?php if ($metadata) { ?>
-<div id="metadata" class="margin_top">
+<div id="metadata" class="mtm">
 <h2><?php echo elgg_echo('metadata'); ?></h2>
 	<?php
 		foreach ($metadata as $m) {
 ?>
-		<p class="margin_none"><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p>
+		<p class="margin-none"><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p>
 <?php
 		}
 	?>
@@ -46,13 +49,13 @@ $exportable_values = $entity->getExportableValues();
 <?php } ?>
 
 <?php if ($annotations) { ?>
-<div id="annotations" class="margin_top">
+<div id="annotations" class="mtm">
 <h2><?php echo elgg_echo('annotations'); ?></h2>
 	<?php
 		foreach ($annotations as $a) {
 ?>
 		<table>
-			<p class="margin_none"><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p>
+			<p class="margin-none"><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p>
 		</table>
 <?php
 		}
@@ -61,13 +64,13 @@ $exportable_values = $entity->getExportableValues();
 <?php } ?>
 
 <?php if ($relationships) { ?>
-<div id="relationship" class="margin_top">
+<div id="relationship" class="mtm">
 <h2><?php echo elgg_echo('relationships'); ?></h2>
 	<?php
 		foreach ($relationships as $r) {
 ?>
 		<table>
-			<p class="margin_none"><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p>
+			<p class="margin-none"><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p>
 		</table>
 <?php
 		}
diff --git a/views/default/export/metadata.php b/views/default/export/metadata.php
index 477cde3c3..1dd7f2054 100644
--- a/views/default/export/metadata.php
+++ b/views/default/export/metadata.php
@@ -10,5 +10,5 @@
 $m = $vars['metadata'];
 $e = get_entity($m->entity_guid);
 ?>
-<p class="margin_none"><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid;
+<p class="margin-none"><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid;
 ?>: <b><?php echo $m->name; ?></b> <?php echo $m->value; ?></p>
\ No newline at end of file
diff --git a/views/default/export/relationship.php b/views/default/export/relationship.php
index e7c8ac121..d8cb3e4f4 100644
--- a/views/default/export/relationship.php
+++ b/views/default/export/relationship.php
@@ -12,7 +12,7 @@ $r = $vars['relationship'];
 $e1 = get_entity($r->guid_one);
 $e2 = get_entity($r->guid_two);
 ?>
-<p class="margin_none"><?php
+<p class="margin-none"><?php
 	if ($e1) echo "<a href=\"" . $e1->getURL() . "\">GUID:" . $r->guid_one . "</a>"; else echo "GUID:".$r->guid_one;
 ?>
 <b><?php echo $r->relationship; ?></b>