Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bug fixes for .30 and 'extra checks' for layout

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
  • Loading branch information...
commit dcbfdc6355841061b557eec62a5e2280407bf227 1 parent 757b5aa
Philip M. Hofer (Frumph) authored
View
7 changelog.txt
@@ -1,4 +1,8 @@
-2.9.2.30
+2.9.2.30.1
+Made the comments on home page when blog disabled an option on the home tab instead
+found the bug with layouts being set inappropriately - fixed
+
+2.9.2.30
Fixed the issue with the comic navigation widget text boxes not properly escaping and unescapping strings
moved the facebook like script to load in the header to avoid a script error
fixed the reply to javascript to show apparently it doesnt like is_singular, go figure
@@ -18,6 +22,7 @@ if disable_blog_frontpage is enabled, allow comments to be displayed on comic po
wp-pagenavi.php internalization fix w/removal of usage of an option
moved to using add_theme_page()
added proper default.mo and default.po files for proper language translation
+adjusted the disable_sidebarslr option to fit in with the new function that works in the layout-head/foot.php
2.9.2.29.1
$is_comic needed to be set in the archive.php before hand, was giving notice
View
3  comicpress-admin.php
@@ -102,7 +102,8 @@ function comicpress_admin_options() {
'enable_comments_when_comic_blog_disabled',
'disable_blog_frontpage',
'disable_blogheader',
- 'display_first_comic_on_home'
+ 'display_first_comic_on_home',
+ 'display_comments_on_home'
) as $key) {
if (!isset($_REQUEST[$key])) $_REQUEST[$key] = 0;
$comicpress_options[$key] = (bool)( $_REQUEST[$key] == 1 ? true : false );
View
64 functions.php
@@ -20,6 +20,32 @@
if (!isset($content_width)) $content_width = 520;
+global $comiccat, $blogcat,
+$comic_folder, $rss_comic_folder, $mini_comic_folder,
+$archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount;
+
+if (is_multisite()) {
+ // This section keeps it compatible with comicpress manager's options
+ $variables_to_extract = array();
+
+ foreach (array(
+ 'comiccat' => 'comiccat',
+ 'blogcat' => 'blogcat',
+ 'comics_path' => 'comic_folder',
+ 'comicsrss_path' => 'rss_comic_folder',
+ 'comicsarchive_path' => 'archive_comic_folder',
+ 'comicsmini_path' => 'mini_comic_folder',
+ 'archive_comic_width' => 'archive_comic_width',
+ 'rss_comic_width' => 'rss_comic_width',
+ 'mini_comic_width' => 'mini_comic_width',
+ 'blog_postcount' => 'blog_postcount') as $options => $variable_name) {
+ $variables_to_extract[$variable_name] = get_option("comicpress-${options}");
+ }
+ extract($variables_to_extract);
+} else {
+ @require_once( get_template_directory() . '/comicpress-config.php');
+}
+
/* child-functions.php / child-widgets.php - in the child theme */
get_template_part('child', 'functions');
get_template_part('child', 'widgets');
@@ -467,7 +493,8 @@ function comicpress_load_options() {
'mini_comic_width' => '198' */
'enable_page_options' => true,
'enable_caps' => false,
- 'display_first_comic_on_home' => false
+ 'display_first_comic_on_home' => false,
+ 'display_comments_on_home' => false
) as $field => $value) {
$comicpress_options[$field] = $value;
}
@@ -481,31 +508,8 @@ function comicpress_themeinfo($whichinfo = null) {
global $comicpress_themeinfo;
if (empty($comicpress_themeinfo) || ($whichinfo == 'reset')) {
-
- if (is_multisite()) {
- // This section keeps it compatible with comicpress manager's options
- $variables_to_extract = array();
-
- foreach (array(
- 'comiccat' => 'comiccat',
- 'blogcat' => 'blogcat',
- 'comics_path' => 'comic_folder',
- 'comicsrss_path' => 'rss_comic_folder',
- 'comicsarchive_path' => 'archive_comic_folder',
- 'comicsmini_path' => 'mini_comic_folder',
- 'archive_comic_width' => 'archive_comic_width',
- 'rss_comic_width' => 'rss_comic_width',
- 'mini_comic_width' => 'mini_comic_width',
- 'blog_postcount' => 'blog_postcount') as $options => $variable_name) {
- $variables_to_extract[$variable_name] = get_option("comicpress-${options}");
- }
-
- extract($variables_to_extract);
-
- } else {
- @require_once( get_template_directory() . '/comicpress-config.php');
- }
-
+ global $comiccat, $blogcat, $comic_folder, $rss_comic_folder, $mini_comic_folder,
+ $archive_comic_width, $rss_comic_width, $mini_comic_width, $blog_postcount;
$comicpress_themeinfo = '';
// $comicpress_config = comicpress_load_config();
$comicpress_options = comicpress_load_options();
@@ -547,9 +551,9 @@ function comicpress_themeinfo($whichinfo = null) {
$comicpress_themeinfo['basedir'] = ABSPATH;
$comicpress_themeinfo['baseurl'] = trailingslashit($comicpress_themeinfo['siteurl']);
}
- if ($comicpress_themeinfo['layout'] == 'standard') $comicpress_themeinfo['layout'] = '2cr';
- if ($comicpress_themeinfo['layout'] == 'gn') $comicpress_themeinfo['layout'] = 'lgn';
- if ($comicpress_themeinfo['layout'] == 'v') $comicpress_themeinfo['layout'] = '2cvl';
+ if ($comicpress_themeinfo['cp_theme_layout'] == 'standard') $comicpress_themeinfo['cp_theme_layout'] = '2cr';
+ if ($comicpress_themeinfo['cp_theme_layout'] == 'gn') $comicpress_themeinfo['cp_theme_layout'] = 'lgn';
+ if ($comicpress_themeinfo['cp_theme_layout'] == 'v') $comicpress_themeinfo['cp_theme_layout'] = '2cvl';
}
if ($whichinfo && $whichinfo !== 'reset')
if (isset($comicpress_themeinfo[$whichinfo]))
@@ -642,7 +646,7 @@ function comicpress_get_string_to_exclude_all_but_provided_categories($category)
function comicpress_disable_sidebars() {
global $post;
- if (comicpress_is_signup()) return true;
+ if (comicpress_is_signup() || comicpress_themeinfo('disable_lrsidebars')) return true;
if (is_page() && !empty($post)) {
$sidebars_disabled = get_post_meta($post->ID, 'disable-sidebars', true);
if ($sidebars_disabled) return true;
View
6 functions/classes.php
@@ -86,7 +86,11 @@ function comicpress_body_class($classes = '') {
}
if (comicpress_disable_sidebars()) $classes[] = 'wide';
-
+
+ if ( comicpress_themeinfo('cp_theme_layout') == '2cr' ) $classes[] = 'layout-standard';
+ if ( comicpress_themeinfo('cp_theme_layout') == 'lgn' ) $classes[] = 'layout-gn';
+ if ( comicpress_themeinfo('cp_theme_layout') == '2cvl' ) $classes[] = 'layout-v';
+
$classes[] = 'layout-'.comicpress_themeinfo('cp_theme_layout');
return $classes;
View
2  index.php
@@ -7,7 +7,7 @@
$comicFrontpage->query('showposts=1&order='.$order.'&cat='.comicpress_all_comic_categories_string());
while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
comicpress_display_post();
- if (comicpress_themeinfo('disable_blog_frontpage')) {
+ if (comicpress_themeinfo('disable_blog_frontpage') && comicpress_themeinfo('display_comments_on_home')) {
$withcomments = 1;
comments_template('', true);
}
View
9 options/home.php
@@ -76,6 +76,15 @@
</td>
</tr>
<tr class="alternate">
+ <th scope="row"><label for="display_comments_on_home"><?php _e('Display comments on the home page when the blog on home is disabled?','comicpress'); ?></label></th>
+ <td>
+ <input id="display_comments_on_home" name="display_comments_on_home" type="checkbox" value="1" <?php checked(true, comicpress_themeinfo('display_comments_on_home')); ?> />
+ </td>
+ <td>
+ <?php _e('When you have the blog on the home page disabled, this option will allow comments on the home page to appear.','comicpress'); ?>
+ </td>
+ </tr>
+ <tr>
<th scope="row"><label for="display_first_comic_on_home"><?php _e('Display the first comic on the home page instead of latest?','comicpress'); ?></label></th>
<td>
<input id="display_first_comic_on_home" name="display_first_comic_on_home" type="checkbox" value="1" <?php checked(true, comicpress_themeinfo('display_first_comic_on_home')); ?> />
View
1  style.css
@@ -63,6 +63,7 @@ img {
text-align: center;
border: solid 1px #ccc;
background: #ccc;
+ padding: 2px;
}
.post-author-gravatar img {

0 comments on commit dcbfdc6

Please sign in to comment.
Something went wrong with that request. Please try again.