From 8a8e50ba68b273cb1350555731213054cd7bdb63 Mon Sep 17 00:00:00 2001
From: "Philip M. Hofer (Frumph)" <frumph_dragon@yahoo.com>
Date: Tue, 1 Dec 2009 13:02:03 -0800
Subject: [PATCH] changed function names for the embed's of the .inc's

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
---
 functions.php     | 4 ++--
 sidebar-left.php  | 2 +-
 sidebar-right.php | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/functions.php b/functions.php
index 7bcfc2d..1f43826 100644
--- a/functions.php
+++ b/functions.php
@@ -883,7 +883,7 @@ if (comicpress_check_child_file('childfunctions') == false) {}
 /**
  * Render the ComicPress calendar widget.
  */
-function comicpress_calendar() {
+function comicpress_calendar_embed() {
 	$calendar = new CalendarWidget();
 
 	$instance = array();
@@ -897,7 +897,7 @@ function comicpress_calendar() {
 /**
  * Render the ComicPress bookmark widget.
  */
-function comicpress_comic_bookmark() {
+function comicpress_comic_bookmark_embed() {
 	$bookmark = new BookmarkWidget();
 	$bookmark->init();
 	$bookmark->widget(array(), array());
diff --git a/sidebar-left.php b/sidebar-left.php
index e210e2e..8779f97 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -6,7 +6,7 @@
 	<div class="sidebar">
 		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
 			<div class="widget">
-				<?php comicpress_calendar() ?>
+				<?php comicpress_calendar_embed() ?>
 			</div>
 			<div class="widget">
 				<?php comicpress_archive_dropdown(); ?>
diff --git a/sidebar-right.php b/sidebar-right.php
index 61bcac6..da18fbc 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -4,9 +4,12 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
 	<div class="sidebar-head"></div>
 		<div class="sidebar">
 			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : ?>
+					<div class="widget">
+						<?php comicpress_comic_bookmark_embed(); ?>
+					</div>				
 				<?php if (is_cp_theme_layout('standard,v')) { ?>
 					<div class="widget">
-						<?php comicpress_calendar(); ?>
+						<?php comicpress_calendar_embed(); ?>
 					</div>
 				<?php } ?>
 				<div class="widget">