From 3153800485f276eeca4215f268b40dbc94038728 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Fri, 25 Dec 2009 10:06:14 -0800
Subject: [PATCH] Random NOTICE fixes with WP_DEBUG turned on.

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 functions.php                    | 4 +++-
 functions/displaypost.php        | 4 ++--
 functions/membersonly.php        | 2 +-
 functions/moods.php              | 2 +-
 functions/searchcustomfields.php | 4 ++--
 functions/shortcodes.php         | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/functions.php b/functions.php
index 54c9c21..5736a1c 100644
--- a/functions.php
+++ b/functions.php
@@ -1,5 +1,7 @@
 <?php
 
+global $comicpress_options;
+
 // the_post_thumbnail('thumbnail/medium/full');
 if (function_exists('add_theme_support')) {
 	add_theme_support( 'post-thumbnails' );
@@ -394,7 +396,7 @@ function get_adjacent_comic($category, $previous = false) {
  * Find the terminal post in a specific category.
  */
 function get_terminal_post_in_category($categoryID, $first = true) {
-  global $post;
+  global $post, $wp_query;
 
   $temp = $wp_query; $wp_query = null;
   $sortOrder = $first ? "asc" : "desc";
diff --git a/functions/displaypost.php b/functions/displaypost.php
index d7c8e2b..99eafc6 100644
--- a/functions/displaypost.php
+++ b/functions/displaypost.php
@@ -51,7 +51,7 @@ function comicpress_display_post_category() {
 	global $post, $wp_query, $comicpress_options;
 	if (!$comicpress_options['disable_categories_in_posts']) {
 		if (get_option('comicpress-enable-storyline-support') == 1 && in_comic_category()) {
-			$post_category = "<ul class=\"storyline-cats\"><li class=\"storyline-root\">". get_the_category_list(' &raquo; </li><li>', multiple)."</li></ul>\r\n";
+			$post_category = "<ul class=\"storyline-cats\"><li class=\"storyline-root\">". get_the_category_list(' &raquo; </li><li>', 'multiple')."</li></ul>\r\n";
 		} else {
 			$post_category = "<div class=\"post-cat\">". __('Posted In: ','comicpress') .get_the_category_list(',')."</div>\r\n";
 		}
@@ -101,7 +101,7 @@ function comicpress_display_blog_navigation() {
 }
 
 function comicpress_display_comic_navigation() {
-	global $post, $wp_query;
+	global $post, $wp_query, $comicpress_options;
 	if (!$comicpress_options['disable_default_comic_nav']) { 
 		$first_comic = get_first_comic_permalink(); 
 		$last_comic = get_last_comic_permalink();
diff --git a/functions/membersonly.php b/functions/membersonly.php
index 4505ea5..183998d 100644
--- a/functions/membersonly.php
+++ b/functions/membersonly.php
@@ -21,7 +21,7 @@ add_action('edit_user_profile', 'comicpress_profile_members_only');
 add_action('profile_update', 'comicpress_profile_members_only_save');
 
 
-add_filter('pre_get_posts','comicpress_members_filter');
+// add_filter('pre_get_posts','comicpress_members_filter');
 
 function comicpress_members_filter($query) {
 	global $comicpress_options, $current_user;
diff --git a/functions/moods.php b/functions/moods.php
index c2217a2..40d9f42 100644
--- a/functions/moods.php
+++ b/functions/moods.php
@@ -21,7 +21,7 @@ function comicpress_show_mood_in_post() {
 	if (!empty($moods_directory) && $moods_directory != 'none') {
 		$mood_file = get_post_meta( get_the_ID(), "mood", true );
 		if (!empty($mood_file) && $mood_file != '') {
-			$mood = explode(".", $mood);
+			$mood = explode(".", $mood_file);
 			$mood = reset($mood);
 			if ( !empty($mood_file) && file_exists(get_stylesheet_directory() . '/images/moods/'.$moods_directory.'/'.$mood_file) ) { ?>
 				<div class="post-mood post-<?php echo $mood; ?>"><img src="<?php echo get_stylesheet_directory_uri(); ?>/images/moods/<?php echo $moods_directory; ?>/<?php echo $mood_file; ?>" alt="<?php echo $mood; ?>" title="<?php echo $mood; ?>" /></div>
diff --git a/functions/searchcustomfields.php b/functions/searchcustomfields.php
index b71f53f..8fbed89 100644
--- a/functions/searchcustomfields.php
+++ b/functions/searchcustomfields.php
@@ -16,8 +16,8 @@ Author URI: http://szub.net
 */
 
 function szub_search_custom_join($join) {
-	global $wpdb;
-	if( is_search() && szub_is_search_key() ) {
+	global $wpdb, $wp_query;
+	if( /* is_search() && */ szub_is_search_key() ) {
 		$join = " LEFT JOIN $wpdb->postmeta ON $wpdb->posts.ID = $wpdb->postmeta.post_id ";
 	}
 	return $join;
diff --git a/functions/shortcodes.php b/functions/shortcodes.php
index 1fb03c5..a4e5ab8 100644
--- a/functions/shortcodes.php
+++ b/functions/shortcodes.php
@@ -4,7 +4,7 @@ add_shortcode( 'version', 'comicpress_ver_shortcode' );
 
 function comicpress_ver_shortcode( $atts, $content = null ) {
 	global $comicpress_options;
-	return '<div class="comicpress_ver">'.$comicpress_version['comicpress_version'].'</div>';
+	return '<div class="comicpress_ver">'.$comicpress_options['comicpress_version'].'</div>';
 }
 
 ?>
\ No newline at end of file