github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Caught more of the old options being used and converted them to the new $comicpress_options I might be missing one or two if anyone finds one, report =) 

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
This commit is contained in:
Philip M. Hofer (Frumph) 2009-11-22 22:47:53 -08:00
parent 830e3ef84c
commit 5f02e0bb93
17 changed files with 29 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comments.php
View File

@ -35,7 +35,7 @@ if ( post_password_required() ) { ?>
</ol> </ol>
<?php endif; ?> <?php endif; ?>
<?php global $enable_numbered_pagination; if ($enable_numbered_pagination == 'yes') { ?> <?php if ($comicpress_options['enable_numbered_pagination']) { ?>
<?php <?php
$pagelinks = paginate_comments_links(array('echo' => 0)); $pagelinks = paginate_comments_links(array('echo' => 0));
if (!empty($pagelinks)) { if (!empty($pagelinks)) {
@ -98,8 +98,8 @@ if ( post_password_required() ) { ?>
<?php do_action('comment_form', $post->ID); ?> <?php do_action('comment_form', $post->ID); ?>
<p><textarea name="comment" id="comment-textarea" cols="60" rows="6" tabindex="4"></textarea></p> <p><textarea name="comment" id="comment-textarea" cols="60" rows="6" tabindex="4"></textarea></p>
<p><button type="submit" class="comment-submit"><?php _e('Submit Comment','comicpress'); ?></button></p> <p><button type="submit" class="comment-submit"><?php _e('Submit Comment','comicpress'); ?></button></p>
<?php global $disable_comment_note; <?php
if ($disable_comment_note != 'yes') { ?> if (!$comicpress_options['disable_comment_note']) { ?>
<p><span class="comment-note"><?php _e('NOTE - You can use these tags:','comicpress'); ?><br /><?php echo allowed_tags(); ?></span></p> <p><span class="comment-note"><?php _e('NOTE - You can use these tags:','comicpress'); ?><br /><?php echo allowed_tags(); ?></span></p>
<?php } ?> <?php } ?>
<?php comment_id_fields(); ?> <?php comment_id_fields(); ?>

2
footer.php
View File

@ -7,7 +7,7 @@
</div> </div>
<?php } ?> <?php } ?>
<?php get_sidebar('footer'); ?> <?php get_sidebar('footer'); ?>
<?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?> <?php global $wpmu_version; if (!$comicpress_options['disable_footer_text']) { ?>
<p> <p>
<span class="footer-copyright"> <span class="footer-copyright">
<?php echo comicpress_copyright(); ?> <?php echo comicpress_copyright(); ?>

79
functions.php
View File

@ -149,86 +149,11 @@ function comicpress_load_options() {
add_option('comicpress_options', $comicpress_options, '', 'yes'); add_option('comicpress_options', $comicpress_options, '', 'yes');
// update_option('comicpress_options', $comicpress_options); // update_option('comicpress_options', $comicpress_options);
} }
$comicpress_options['comicpress_version'] = '2.9.0.1'; $comicpress_options['comicpress_version'] = '2.9.0.2';
update_option('comicpress_options', $comicpress_options); update_option('comicpress_options', $comicpress_options);
return $comicpress_options; return $comicpress_options;
} }
if (get_option('upload_path') !== false) {
$variables_to_extract = array();
foreach (array(
'disable_comic_frontpage' => 'disable_comic_frontpage',
'disable_comic_blog_frontpage' => 'disable_comic_blog_frontpage',
'disable_comic_blog_single' => 'disable_comic_blog_single',
'disable_blog_frontpage' => 'disable_blog_frontpage',
'buy_print_email' => 'buy_print_email',
'buy_print_url' => 'buy_print_url',
'buy_print_us_amount' => 'buy_print_us_amount',
'buy_print_int_amount' => 'buy_print_int_amount',
'buy_print_add_shipping' => 'buy_print_add_shipping',
'buy_print_us_ship' => 'buy_print_us_ship',
'buy_print_int_ship' => 'buy_print_int_ship',
'cp_theme_layout' => 'cp_theme_layout',
'transcript_in_posts' => 'transcript_in_posts',
'enable_widgetarea_use_sidebar_css' => 'enable_widgetarea_use_sidebar_css',
'enable_custom_image_header' => 'enable_custom_image_header',
'custom_image_header_width' => 'custom_image_header_width',
'custom_image_header_height' => 'custom_image_header_height',
'enable_numbered_pagination' => 'enable_numbered_pagination',
'disable_page_restraints' => 'disable_page_restraints',
'enable_related_comics' => 'enable_related_comics',
'enable_related_posts' => 'enable_related_posts',
'comic_clicks_next' => 'comic_clicks_next',
'rascal_says' => 'rascal_says',
'enable_post_calendar' => 'enable_post_calendar',
'enable_post_author_gravatar' => 'enable_post_author_gravatar',
'enable_comic_post_calendar' => 'enable_comic_post_calendar',
'enable_comic_post_author_gravatar' => 'enable_comic_post_author_gravatar',
'disable_tags_in_posts' => 'disable_tags_in_posts',
'disable_categories_in_posts' => 'disable_categories_in_posts',
'moods_directory' => 'moods_directory',
'graphicnav_directory' => 'graphicnav_directory',
'enable_search_in_menubar' => 'enable_search_in_menubar',
'enable_rss_in_menubar' => 'enable_rss_in_menubar',
'enable_navigation_in_menubar' => 'enable_navigation_in_menubar',
'disable_lrsidebars_frontpage' => 'disable_lrsidebars_frontpage',
'calendar_directory' => 'calendar_directory',
'contact_in_menubar' => 'contact_in_menubar',
'disable_dynamic_menubar_links' => 'disable_dynamic_menubar_links',
'disable_footer_text' => 'disable_footer_text',
'avatar_directory' => 'avatar_directory',
'archive_display_order' => 'archive_display_order',
'disable_comment_note' => 'disable_comment_note',
'excerpt_or_content_archive' => 'excerpt_or_content_archive',
'excerpt_or_content_search' => 'excerpt_or_content_search',
'category_thumbnail_postcount' => 'category_thumbnail_postcount',
'members_post_category' => 'members_post_category',
'blogposts_with_comic' => 'blogposts_with_comic',
'split_column_in_two' => 'split_column_in_two',
'author_column_one' => 'author_column_one',
'author_column_two' => 'author_column_two',
'remove_wptexturize' => 'remove_wptexturize',
'disable_default_menubar' => 'disable_default_menubar',
'disable_blogheader' => 'disable_blogheader',
'disable_page_titles' => 'disable_page_titles',
'static_blog' => 'static_blog',
'disable_default_comic_nav' => 'disable_default_comic_nav' ) as $options => $variable_name) {
$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
}
extract($variables_to_extract);
}
if (empty($avatar_directory)) $avatar_directory = 'default';
if (empty($graphicnav_directory)) $graphicnav_directory = 'default';
if (empty($moods_directory)) $moods_directory = 'default';
if (empty($calendar_directory)) $calendar_directory = 'default';
if (empty($cp_theme_layout)) $cp_theme_layout='standard';
function is_cp_theme_layout($choices) { function is_cp_theme_layout($choices) {
global $comicpress_options; global $comicpress_options;
$choices = explode(",", $choices); $choices = explode(",", $choices);
@ -241,7 +166,7 @@ global $comicpress_options;
return false; return false;
} }
if ($remove_wptexturize == 'yes') { if ($comicpress_options['remove_wptexturize']) {
// Remove the wptexturizer from changing the quotes and squotes. // Remove the wptexturizer from changing the quotes and squotes.
// remove_filter('the_content', 'wpautop'); // remove_filter('the_content', 'wpautop');
// remove_filter('the_title', 'wptexturize'); // remove_filter('the_title', 'wptexturize');

2
sidebar-above.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Above Header')) { ?> <?php if (comicpress_is_active_sidebar('Above Header')) { ?>
<div id="sidebar-aboveheader" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-aboveheader" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Above Header') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-blog.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Blog')) { ?> <?php if (comicpress_is_active_sidebar('Blog')) { ?>
<div id="sidebar-blog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-blog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Blog') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Blog') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-comicleft.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Left of Comic')) { ?> <?php if (comicpress_is_active_sidebar('Left of Comic')) { ?>
<div id="sidebar-comicleft" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-comicleft" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left of Comic') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left of Comic') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-comicright.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Right of Comic')) { ?> <?php if (comicpress_is_active_sidebar('Right of Comic')) { ?>
<div id="sidebar-comicright" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-comicright" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right of Comic') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right of Comic') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-footer.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Footer')) { ?> <?php if (comicpress_is_active_sidebar('Footer')) { ?>
<div id="sidebar-footer" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-footer" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Footer') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Footer') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-header.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Header')) { ?> <?php if (comicpress_is_active_sidebar('Header')) { ?>
<div id="sidebar-header" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-header" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

4
sidebar-left.php
View File

@ -1,5 +1,5 @@
<?php global $disable_lrsidebars_frontpage; <?php
if ($disable_lrsidebars_frontpage == 'yes' && is_home()) { if ($comicpress_options['disable_lrsidebars_frontpage'] && is_home()) {
} else { ?> } else { ?>
<div id="sidebar-left"> <div id="sidebar-left">
<div class="sidebar-head"></div> <div class="sidebar-head"></div>

5
sidebar-menubar.php
View File

@ -1,11 +1,10 @@
<?php <?php
global $disable_default_menubar; if (!$comicpress_options['disable_default_menubar']) {
if ($disable_default_menubar != 'yes') {
comicpress_menubar(); comicpress_menubar();
} }
?> ?>
<?php if (comicpress_is_active_sidebar('Menubar')) { ?> <?php if (comicpress_is_active_sidebar('Menubar')) { ?>
<div id="sidebar-menubar" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-menubar" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-over.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Over Comic')) { ?> <?php if (comicpress_is_active_sidebar('Over Comic')) { ?>
<div id="sidebar-overcomic" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-overcomic" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Comic') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Comic') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-overblog.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Over Blog')) { ?> <?php if (comicpress_is_active_sidebar('Over Blog')) { ?>
<div id="sidebar-overblog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-overblog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Blog') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Over Blog') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

4
sidebar-right.php
View File

@ -1,5 +1,5 @@
<?php global $disable_lrsidebars_frontpage; <?php
if ($disable_lrsidebars_frontpage != 'yes') { ?> if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
<div id="sidebar-right"> <div id="sidebar-right">
<div class="sidebar-head"></div> <div class="sidebar-head"></div>
<div class="sidebar"> <div class="sidebar">

2
sidebar-under.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Under Comic')) { ?> <?php if (comicpress_is_active_sidebar('Under Comic')) { ?>
<div id="sidebar-undercomic" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-undercomic" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Comic') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Comic') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

2
sidebar-underblog.php
View File

@ -1,5 +1,5 @@
<?php if (comicpress_is_active_sidebar('Under Blog')) { ?> <?php if (comicpress_is_active_sidebar('Under Blog')) { ?>
<div id="sidebar-underblog" class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>"> <div id="sidebar-underblog" class="customsidebar <?php if ($comicpress_options['enable_widgetarea_use_sidebar_css']) { ?> sidebar<?php } ?>">
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Blog') ) : ?><?php endif; ?> <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Under Blog') ) : ?><?php endif; ?>
</div> </div>
<?php } ?> <?php } ?>

12
widgets/menubar.php
View File

@ -11,7 +11,7 @@ Author URI: http://frumph.net/
function comicpress_menubar() { function comicpress_menubar() {
global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links; global $comicpress_options;
if (comicpress_check_child_file('menubar') == false) { if (comicpress_check_child_file('menubar') == false) {
if (file_exists(get_template_directory() . '/custom-menubar.php')) { if (file_exists(get_template_directory() . '/custom-menubar.php')) {
include(get_template_directory() . '/custom-menubar.php'); include(get_template_directory() . '/custom-menubar.php');
@ -19,13 +19,13 @@ global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$ena
<div id="menubar"> <div id="menubar">
<div id="menunav"> <div id="menunav">
<?php if ($enable_search_in_menubar == 'yes') { ?> <?php if ($comicpress_options['enable_search_in_menubar']) { ?>
<div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div> <div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div>
<?php } ?> <?php } ?>
<?php if ($enable_rss_in_menubar == 'yes') { ?> <?php if ($comicpress_options['enable_rss_in_menubar']) { ?>
<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a> <a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
<?php } ?> <?php } ?>
<?php if ($enable_navigation_in_menubar == 'yes') { ?> <?php if ($comicpress_options['enable_navigation_in_menubar']) { ?>
<?php if (is_home()) { <?php if (is_home()) {
$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string()); $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post(); while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
@ -56,7 +56,7 @@ global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$ena
$bookmarks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $bookmarks); $bookmarks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $bookmarks);
$bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks); $bookmarks = preg_replace('#<ul ([^>]*)>#', '<ul>', $bookmarks);
$listpages = ''; $listpages = '';
if ($disable_dynamic_menubar_links != 'yes') { if (!$comicpress_options['disable_dynamic_menubar_links']) {
$listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li='); $listpages = wp_list_pages('echo=0&sort_column=menu_order&depth=4&title_li=');
} }
if (!empty($bookmarks)) { if (!empty($bookmarks)) {
@ -77,7 +77,7 @@ global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$ena
<ul id="menu"> <ul id="menu">
<li class="page_item page-item-home<?php if (is_home()) { ?> current_page_item<?php } ?>"><a href="<?php bloginfo('url'); ?>">Home</a></li> <li class="page_item page-item-home<?php if (is_home()) { ?> current_page_item<?php } ?>"><a href="<?php bloginfo('url'); ?>">Home</a></li>
<?php echo $listpages; ?> <?php echo $listpages; ?>
<?php if ($contact_in_menubar == 'yes') { ?> <?php if ($comicpress_options['contact_in_menubar']) { ?>
<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li> <li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
<?php } ?> <?php } ?>
</ul> </ul>