From 798c876ba1cb5b83f6cd6616b90321e9e527b864 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 4 Jan 2011 00:40:12 -0700
Subject: Convert the metadata array to be associative. Replaced single with
 double-quotes. Indenting fixes.

---
 modules/info/helpers/info_block.php    | 48 +++++++++++++++++-----------------
 modules/info/views/info_block.html.php |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'modules/info')

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>
-- 
cgit v1.2.3