summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2011-01-04 00:40:12 -0700
committerChad Kieffer <ckieffer@gmail.com>2011-01-04 00:40:12 -0700
commit798c876ba1cb5b83f6cd6616b90321e9e527b864 (patch)
tree0f18218e6c6210b9fc8f24925b01db62982f5ce2
parentf7f6cbf04ff2b19535b0d3b9dbd5f4ab41395bfc (diff)
Convert the metadata array to be associative. Replaced single with double-quotes. Indenting fixes.
-rw-r--r--modules/info/helpers/info_block.php48
-rw-r--r--modules/info/views/info_block.html.php2
2 files changed, 25 insertions, 25 deletions
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 97820d84..f061f7eb 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -31,40 +31,40 @@ class info_block_Core {
$block->css_id = "g-metadata";
$block->title = $theme->item()->is_album() ? t("Album info") : t("Photo info");
$block->content = new View("info_block.html");
-
- $info[] = array(
- 'label' => t("Title:"),
- 'value' => html::purify($theme->item->title)
- );
+ $info["title"] = array(
+ "label" => t("Title:"),
+ "value" => html::purify($theme->item->title)
+ );
if ($theme->item->description) {
- $info[] = array(
- 'label' => t("Description:"),
- 'value' => nl2br(html::purify($theme->item->description))
- );
+ $info["description"] = array(
+ "label" => t("Description:"),
+ "value" => nl2br(html::purify($theme->item->description))
+ );
}
if (!$theme->item->is_album()) {
- $info[] = array(
- 'label' => t("File name:"),
- 'value' => html::clean($theme->item->name));
+ $info["file_name"] = array(
+ "label" => t("File name:"),
+ "value" => html::clean($theme->item->name)
+ );
}
if ($theme->item->captured) {
- $info[] = array(
- 'label' => t("Captured:"),
- 'value' => gallery::date_time($theme->item->captured)
- );
+ $info["captured"] = array(
+ "label" => t("Captured:"),
+ "value" => gallery::date_time($theme->item->captured)
+ );
}
if ($theme->item->owner) {
$display_name = $theme->item->owner->display_name();
if ($theme->item->owner->url) {
- $info[] = array(
- 'label' => t("Owner:"),
- 'value' => "<a href=\"{$theme->item->owner->url}\">" . html::clean($display_name) . "</a>"
- );
+ $info["owner"] = array(
+ "label" => t("Owner:"),
+ "value" => "<a href=\"{$theme->item->owner->url}\">" . html::clean($display_name) . "</a>"
+ );
} else {
- $info[] = array(
- 'label' => t("Owner:"),
- 'value' => html::clean($display_name)
- );
+ $info["owner"] = array(
+ "label" => t("Owner:"),
+ "value" => html::clean($display_name)
+ );
}
}
$block->content->metadata = $info;
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 88f29a88..7c162767 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -2,7 +2,7 @@
<ul class="g-metadata">
<? foreach($metadata as $k => $v): ?>
<li>
- <strong class="caption"><?= $v['label'] ?></strong> <?= $v['value'] ?>
+ <strong class="caption"><?= $v["label"] ?></strong> <?= $v["value"] ?>
</li>
<? endforeach; ?>
</ul>