From e24997eda11f86cdd47b971fde7be80e7c3df3b2 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Tue, 4 Jan 2011 15:57:31 -0700 Subject: [PATCH 1/3] Add bit.ly link to refactored info block via info_block_metadata event hook. --- 3.1/modules/bitly/helpers/bitly_event.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/3.1/modules/bitly/helpers/bitly_event.php b/3.1/modules/bitly/helpers/bitly_event.php index 9a55fe95..f84b234a 100644 --- a/3.1/modules/bitly/helpers/bitly_event.php +++ b/3.1/modules/bitly/helpers/bitly_event.php @@ -51,4 +51,17 @@ class bitly_event_Core { ->css_class("g-bitly-shorten ui-icon-link")); } } + + static function info_block_metadata($block, $item_id) { + $link = ORM::factory("bitly_link")->where("item_id", "=", $item_id)->find(); + if ($link->loaded()) { + $info = $block->content->metadata; + $info["bitly_url"] = array( + "label" => t("bit.ly url:"), + "value" => bitly::url($link->hash) + ); + $block->content->metadata = $info; + } + } + } From fa79b1b447cae2d365e1bb44c9e74003d5fb7fb0 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Tue, 4 Jan 2011 19:27:22 -0700 Subject: [PATCH 2/3] Item ID is no longer required by info_block_metadata event, the entire item object is. --- 3.1/modules/bitly/helpers/bitly_event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.1/modules/bitly/helpers/bitly_event.php b/3.1/modules/bitly/helpers/bitly_event.php index f84b234a..781f33f6 100644 --- a/3.1/modules/bitly/helpers/bitly_event.php +++ b/3.1/modules/bitly/helpers/bitly_event.php @@ -52,8 +52,8 @@ class bitly_event_Core { } } - static function info_block_metadata($block, $item_id) { - $link = ORM::factory("bitly_link")->where("item_id", "=", $item_id)->find(); + static function info_block_metadata($block, $item) { + $link = ORM::factory("bitly_link")->where("item_id", "=", $item->id)->find(); if ($link->loaded()) { $info = $block->content->metadata; $info["bitly_url"] = array( From b2398036ec4af826fec23c6a6e6e9c3b314e026a Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Thu, 6 Jan 2011 21:06:40 -0700 Subject: [PATCH 3/3] Changed info_block_metadata event to info_block_get_metadata per 06d94065ce0919f34151. --- 3.1/modules/bitly/helpers/bitly_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.1/modules/bitly/helpers/bitly_event.php b/3.1/modules/bitly/helpers/bitly_event.php index 781f33f6..68670e4d 100644 --- a/3.1/modules/bitly/helpers/bitly_event.php +++ b/3.1/modules/bitly/helpers/bitly_event.php @@ -52,7 +52,7 @@ class bitly_event_Core { } } - static function info_block_metadata($block, $item) { + static function info_block_get_metadata($block, $item) { $link = ORM::factory("bitly_link")->where("item_id", "=", $item->id)->find(); if ($link->loaded()) { $info = $block->content->metadata;