Permalink
Browse files

adjusted membersonly to not remove the </p></p> simple css changes fi…

…nally fixed the saving of the titles in the comic navigation (i hope)

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
  • Loading branch information...
Philip M. Hofer (Frumph)
Philip M. Hofer (Frumph) committed Jan 18, 2011
1 parent 1c4c258 commit b5386f1a62808ee7623c840e8e3d8e9d592da04e
Showing with 53 additions and 46 deletions.
  1. +2 −2 addons/membersonly.php
  2. +5 −1 changelog.txt
  3. +10 −6 functions.php
  4. +0 −1 functions/displaypost.php
  5. +2 −2 style.css
  6. +34 −34 widgets/comic-navigation.php
View
@@ -51,8 +51,8 @@ function shortcode_for_comicpress_members_only( $atts, $content = null ) {
if ( !empty($current_user->ID) && !empty($content) ) {
$is_member = get_user_meta($current_user->ID,'comicpress-is-member', true);
if ($is_member || current_user_can('manage_options')) {
- $content = str_replace('<p>', '', $content);
- $content = str_replace('</p>', '', $content);
+// $content = str_replace('<p>', '', $content);
+// $content = str_replace('</p>', '', $content);
$returninfo = "<div class=\"members-only\">$content</div>\r\n";
}
}
View
@@ -1,4 +1,8 @@
-2.9.2.29.1
+2.9.2.29.2
+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
+
+2.9.2.29.1
$is_comic needed to be set in the archive.php before hand, was giving notice
thanks to @generaltekno for finding bug with footer-text.php with the scroll to top, adjusted it to be enable_scroll_to_top
again thanks to @generaltekno for finding the facebook like widget needing one of the facebook likes active, now changed to check if the widget is active as well
View
@@ -111,7 +111,10 @@ function comicpress_config() {
// Register Sidebar and Define Widgets
-if ( function_exists('register_sidebar') ) {
+add_action( 'widgets_init', 'comicpress_sidebar_init' );
+
+if (!function_exists('comicpress_sidebar_init')) {
+function comicpress_sidebar_init() {
foreach (array(
__('Left Sidebar', 'comicpress'),
__('Right Sidebar', 'comicpress'),
@@ -136,6 +139,7 @@ function comicpress_config() {
'before_title' => "<h2 class=\"widgettitle\">",
'after_title' => "</h2>\r\n"
));
+ }
}
}
@@ -160,7 +164,7 @@ function __comicpress_init() {
wp_enqueue_script('menubar_js', get_template_directory_uri() . '/js/menubar.js');
}
if (comicpress_themeinfo('enable_scroll_to_top')) {
- wp_enqueue_script('comicpress_scroll', get_template_directory_uri() . '/js/scroll.js', array(), false, true);
+ wp_enqueue_script('comicpress_scroll', get_template_directory_uri() . '/js/scroll.js', null, null, true);
}
if (comicpress_themeinfo('enable_multicomic_jquery')) {
wp_enqueue_script('multicomic', get_template_directory_uri() . '/js/multicomic.js');
@@ -173,7 +177,7 @@ function __comicpress_init() {
wp_enqueue_style('navstyle',get_template_directory_uri() . '/images/nav/default/navstyle.css');
}
if (is_active_widget('comicpress_google_translate_widget', false, 'comicpress_google_translate_widget', true)) {
- wp_enqueue_script('google-translate', 'http://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit', array(), false, true);
+ wp_enqueue_script('google-translate', 'http://translate.google.com/translate_a/element.js?cb=googleTranslateElementInit', null, null, true);
wp_enqueue_script('google-translate-settings', get_template_directory_uri() . '/js/googletranslate.js');
}
if (is_active_widget('comicpress_jquery_bookmark_widget', false, 'comicpress_jquery_bookmark_widget', true)) {
@@ -182,7 +186,7 @@ function __comicpress_init() {
wp_enqueue_script('bookmark', get_template_directory_uri() . '/js/bookmark.js', array('prototype', 'cookiejar'));
}
if (is_active_widget('comicpress_facebook_like_widget', false, 'comicpress_facebook_like_widget', true) || comicpress_themeinfo('facebook_like_blog_post') || comicpress_themeinfo('facebook_like_comic_post'))
- wp_enqueue_script('facebook', 'http://connect.facebook.net/en_US/all.js#xfbml=1', array(), false, true);
+ wp_enqueue_script('easel-facebook', 'http://connect.facebook.net/en_US/all.js#xfbml=1'); // force to the header instead of footer
}
do_action('comicpress_init');
@@ -298,7 +302,7 @@ function comicpress_create_category_tree() {
global $category_tree, $comiccat;
if (empty($category_tree)) {
$categories_by_id = comicpress_get_comic_category_objects_by_id();
- if (empty($categories_by_id)) return false;
+ if (empty($categories_by_id) || !is_array($categories_by_id)) return false;
foreach (array_keys($categories_by_id) as $category_id) {
$category_tree[] = $categories_by_id[$category_id]->parent . '/' . $category_id;
}
@@ -507,7 +511,7 @@ function comicpress_themeinfo($whichinfo = null) {
$comicpress_coreinfo = wp_upload_dir();
$comicpress_addinfo = array(
'upload_path' => get_option('upload_path'),
- 'version' => '2.9.2.29.1',
+ 'version' => '2.9.2.29.2',
'siteurl' => trailingslashit(get_option('siteurl')),
'home' => trailingslashit(home_url()),
'comiccat' => $comiccat,
@@ -87,7 +87,6 @@ function comicpress_display_post_time() {
}
}
-
if (!function_exists('comicpress_display_post_category')) {
function comicpress_display_post_category($is_comic = false) {
global $post, $wp_query;
View
@@ -6,7 +6,7 @@ Description: Publish a comic with WordPress. Visit the ComicPress Website (<a hr
Author: Philip M. Hofer
Author URI: http://frumph.net
Tags: White, Two-Columns, Three-Columns, left-sidebar, right-sidebar, fixed-width, custom-header, theme-options, threaded-comments, sticky-post, translation-ready
-Version: 2.9.2.29
+Version: 2.9.2.29.2
License: GNU General Public License, v3 (or newer)
License URI: http://www.opensource.org/licenses/gpl-3.0.html
.
@@ -211,7 +211,7 @@ h4, h4 a {
text-align: center;
}
-.menunav a {
+.menunav a:link, .menunav a:visited {
color: #fff;
}
Oops, something went wrong.

0 comments on commit b5386f1

Please sign in to comment.