From 9f6ea738d3fe9c403efbf5ca6e3cdce7c24a1fda Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Wed, 22 Sep 2010 00:35:40 -0700
Subject: [PATCH] Comic Locations injection adjustment

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 comiceasel.php           |  9 ---------
 functions/injections.php | 14 ++++----------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/comiceasel.php b/comiceasel.php
index 483d5f5..d6d37a0 100644
--- a/comiceasel.php
+++ b/comiceasel.php
@@ -305,15 +305,6 @@ function ceo_pluginfo($whichinfo = null) {
 	return $ceo_pluginfo;
 }
 
-function ceo_feed_request($requests) {
-	if (isset($requests['feed']))
-		$requests['post_type'] = get_post_types();
-	return $requests;
-}
-
-add_filter('request', 'ceo_feed_request');
-
-
 /**
  * This functions is to display test information on the dashboard, instead of dumping it out to everyone.
  * This is so that a plugin doesn't generate errors on output of the var_dump() to the end user.
diff --git a/functions/injections.php b/functions/injections.php
index bab95f3..7926582 100644
--- a/functions/injections.php
+++ b/functions/injections.php
@@ -80,16 +80,10 @@ add_action('easel-post-info', 'ceo_display_comic_locations');
 
 function ceo_display_comic_locations() {
 	global $post;
-	$allterms = get_the_terms( $post->ID, 'locations');
-	if (!empty($allterms) && !isset($allterms->errors)) {
-		foreach ($allterms as $term) {
-			$term_list_locations[] = '<a href="'.home_url(ceo_clean_filename('/wp-admin/edit.php?post_type=comic&locations='.$term->name)).'">'.$term->name.'</a>';
-		}
-		$output_locations = 'None Set';
-		if (!empty($term_list_locations))
-			$output_locations = join(', ', $term_list_locations );
-	}
-	$output = '<div class="comic-locations">Locations: '.$output_locations."</div>\r\n";
+	$before = '<div class="comic-locations">Locations: ';
+	$sep = ', '; 
+	$after = '</div>';
+	$output = get_the_term_list( $post->ID, 'locations', $before, $sep, $after );
 	echo apply_filters('ceo_display_comic_locations', $output);
 }