Permalink
Browse files

WordPress repository fixes, 2.9.2.26 now

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
  • Loading branch information...
1 parent 0e697cb commit 111fbd10694bf22aee46ea57804f614bd254da8a Philip M. Hofer (Frumph) committed Nov 28, 2010
View
@@ -4,7 +4,7 @@
<div class="post-head"></div>
<div class="post-content">
<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
- <p><a href="<?php bloginfo('url') ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p>
+ <p><a href="<?php echo home_url(); ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p>
<p><?php get_search_form(); ?></p>
</div>
<div class="post-foot"></div>
@@ -1,15 +1,13 @@
<?php
-add_theme_support( 'custom-header' );
-
// Custom Image Header Defaults
define('HEADER_TEXTCOLOR', '');
// define('HEADER_IMAGE', ''); // %s is theme dir
define('HEADER_IMAGE_WIDTH', comicpress_themeinfo('custom_image_header_width'));
define('HEADER_IMAGE_HEIGHT', comicpress_themeinfo('custom_image_header_height'));
define( 'NO_HEADER_TEXT', true );
-function theme_admin_header_style() { ?>
+function comicpress_admin_header_style() { ?>
<style type="text/css">
#headimg {
width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
@@ -26,7 +24,7 @@ function theme_admin_header_style() { ?>
<?php
}
-function theme_header_style() {
+function comicpress_header_style() {
if (get_header_image()) { ?>
<style type="text/css">
#header {
@@ -49,6 +47,6 @@ function theme_header_style() {
<?php }
}
-add_custom_image_header('theme_header_style', 'theme_admin_header_style');
+add_custom_image_header('comicpress_header_style', 'comicpress_admin_header_style');
?>
View
@@ -83,12 +83,11 @@ function comicpress_profile_members_only() {
</table>
<?php }
-
function comicpress_profile_members_only_save() {
$id = (int)$_POST['user_id'];
$is_member = (int)$_POST['comicpress-is-member'];
$comicpress_is_member = (bool)( $is_member == 1 ? 1 : 0 );
- update_usermeta($id, 'comicpress-is-member', $comicpress_is_member);
+ update_user_meta($id, 'comicpress-is-member', $comicpress_is_member);
}
/**
View
@@ -1,4 +1,8 @@
-2.9.2.25
+2.9.2.26
+changed all the bloginfo()'s to appropriate home_url() site_url() get_template_directory_uri()
+changed in the membersonly.php get_usermeta to get_user_meta - same parameters
+
+2.9.2.25
Styled the #s-search and #searchform button and the forms.
changed the padding and line-height in the #menubar-wrapper .menu css
added .post-time / .posted-at new function comicpress_display_post_time() which displays the time the post was made.
@@ -7,7 +11,6 @@ and shows the alt-text whether Rascal is active or not
removed extra id="" in the textarea for the comment form, #comment-textarea no longer exists, its just #comment now
set $outputscript = ''; in the displaycomic.php so it doesn't give notice if it doesn't exist, which it doesn't anyways but oh well; future endeavors.
-
2.9.2.24
Removed the tabindex from the comments.php field for textarea
adding comic-id-# ($post->id) as a wrap with #comic-wrap so that it can be targeted for the current comic post
@@ -1,31 +0,0 @@
-<?php
-
-//COMIC CATEGORY -the WordPress ID # of your comic category (default "3")
-$comiccat = "3";
-
-//BLOG CATEGORY - the WordPress ID of your blog category (default "4")
-$blogcat = "4";
-
-//COMIC FOLDER - the folder your comics files are located in (default "comics")
-$comic_folder = "comics";
-
-//RSS COMIC FOLDER - the folder your comic files are in for the RSS feed (default "comics")
-$rss_comic_folder = "comics-rss";
-
-//ARCHIVE COMIC FOLDER - the folder your comic files are in for your archive pages (default "comics")
-$archive_comic_folder = "comics-archive";
-
-//ARCHIVE COMIC WIDTH - the width your comics will appear on archive or search results (default "380")
-$archive_comic_width = "380";
-
-//RSS COMIC WIDTH - ComicPress Manager plugin users only - the width your comics appear in the RSS feed (default "600").
-$rss_comic_width = "480";
-
-//BLOG POSTCOUNT - the number of blog entries to appear on the home page (default "5").
-$blog_postcount = "5";
-
-//Mini Comic Width - The width your comics will appear in minithumbs (default "100")
-$mini_comic_width = "198";
-
-//Minithumb Comic Folder - The folder for your your mini thumbs (default "comics-mini")
-$mini_comic_folder = "comics-mini";
View
@@ -18,7 +18,6 @@
// This theme allows users to set a custom background
add_custom_background();
-add_theme_support( 'custom-background' );
if (!isset($content_width)) $content_width = 520;
@@ -495,7 +494,7 @@ function comicpress_themeinfo($whichinfo = null) {
$comicpress_coreinfo = wp_upload_dir();
$comicpress_addinfo = array(
'upload_path' => get_option('upload_path'),
- 'version' => '2.9.2.25',
+ 'version' => '2.9.2.26',
'siteurl' => trailingslashit(get_option('siteurl')),
'home' => trailingslashit(home_url()),
'comiccat' => $comiccat,
View
@@ -44,7 +44,7 @@
<div id="header">
<?php do_action('comicpress-header'); ?>
- <h1><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name') ?></a></h1>
+ <h1><a href="<?php echo home_url(); ?>"><?php bloginfo('name') ?></a></h1>
<div class="description"><?php bloginfo('description') ?></div>
<?php if (is_active_sidebar('header')) get_sidebar('header'); ?>
<div class="clear"></div>
View
@@ -1,4 +1,4 @@
-<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<form method="get" id="searchform" action="<?php echo home_url(); ?>">
<div>
<input type="text" value="<?php _e('Search...','comicpress'); ?>" name="s" id="s-search" onfocus="this.value=(this.value=='<?php _e('Search...','comicpress'); ?>') ? '' : this.value;" onblur="this.value=(this.value=='') ? '<?php _e('Search...','comicpress'); ?>' : this.value;" />
<button type="submit">&raquo;</button>
View
@@ -6,7 +6,7 @@ Description: Publish a comic with WordPress. <a href="http://comicpress.org">Vis
Author: Philip M. Hofer, Tyler Martin
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.25
+Version: 2.9.2.26
License: GNU General Public License, v3 (or newer)
License URI: http://www.opensource.org/licenses/gpl-3.0.html
.
@@ -17,12 +17,12 @@ function comicpress_classic_bookmark() {
/* Bookmark Config Settings */
var cl = 31;
- var imgTag = '<?php bloginfo('template_directory'); ?>/images/1.gif'; //add tag image.
- var imgClearOff = '<?php bloginfo('template_directory'); ?>/images/3a.gif'; //no comic tagged, clear not possible
- var imgGotoOff = '<?php bloginfo('template_directory'); ?>/images/2a.gif'; //no comic tagged, goto not possible
- var imgClearOn = '<?php bloginfo('template_directory'); ?>/images/3.gif'; //clear a tag, shows when comic previously tagged
- var imgGotoOn = '<?php bloginfo('template_directory'); ?>/images/2.gif'; //shows when a comic is tagged
- var imgInfo = '<?php bloginfo('template_directory'); ?>/images/4.gif'; //img that displays the help
+ var imgTag = '<?php echo get_template_directory_uri(); ?>/images/1.gif'; //add tag image.
+ var imgClearOff = '<?php echo get_template_directory_uri(); ?>/images/3a.gif'; //no comic tagged, clear not possible
+ var imgGotoOff = '<?php echo get_template_directory_uri(); ?>/images/2a.gif'; //no comic tagged, goto not possible
+ var imgClearOn = '<?php echo get_template_directory_uri(); ?>/images/3.gif'; //clear a tag, shows when comic previously tagged
+ var imgGotoOn = '<?php echo get_template_directory_uri(); ?>/images/2.gif'; //shows when a comic is tagged
+ var imgInfo = '<?php echo get_template_directory_uri(); ?>/images/4.gif'; //img that displays the help
var comicDir = '/'; //alter this if you run multiple comics in different directories on your site.
/* Now write out the applicable links */
@@ -52,7 +52,7 @@ function bmhome() {
document.getElementById('rmc').src = imgClearOn;
}
<?php if (is_home()) { ?>
- createCookie("bm", "<?php bloginfo('wpurl'); ?>", cl);
+ createCookie("bm", "<?php echo site_url(); ?>", cl);
<?php } else { ?>
createCookie("bm", "<?php the_permalink(); ?>", cl);
<?php } ?>
@@ -78,7 +78,7 @@ function comicpress_classic_menubar() {
$listpages .= $menulinks;
?>
<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 echo home_url(); ?>">Home</a></li>
<?php echo $listpages; ?>
<?php if ($comicpress_options['contact_in_menubar']) { ?>
<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
@@ -88,7 +88,7 @@ function widget($args, $instance) {
<a href="<?php echo $instance['archive_path']; ?>" class="navi navi-archives navi-archive" title="<?php echo $instance['archives_title']; ?>"><?php echo $instance['archives_title']; ?></a>
<?php }
if ($instance['random']) { ?>
- <a href="<?php echo bloginfo('url'); ?>/?randomcomic" class="navi navi-random" title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a>
+ <a href="<?php echo home_url(); ?>/?randomcomic" class="navi navi-random" title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a>
<?php }
if ($instance['comictitle']) { ?>
<span class="navi-comictitle"><a href="<?php the_permalink(); ?>">"<?php the_title(); ?>"</a></span>
View
@@ -18,32 +18,32 @@ function comicpress_control_panel_widget($skip_widget_init = false) {
function comicpress_show_control_panel() { ?>
<?php if (!is_user_logged_in()) { ?>
- <form action="<?php bloginfo('url') ?>/wp-login.php" method="post">
+ <form action="<?php echo home_url(); ?>/wp-login.php" method="post">
<?php _e('UserName:','comicpress'); ?><br />
<input type="text" name="log" id="sname" value="<?php echo esc_html(stripslashes($user_login), 1) ?>" size="22" /><br /><br />
<?php _e('Password:','comicpress'); ?><br />
<input type="password" name="pwd" id="spassword" size="22" /><br />
<label for="rememberme"><input name="rememberme" id="rememberme" type="checkbox" checked="checked" value="forever" /> Remember me</label><br />
<br />
<button type="submit" class="button"><?php _e('Login','comicpress'); ?></button>
- <input type="hidden" name="redirect_to" value="<?php bloginfo('url'); ?>"/>
+ <input type="hidden" name="redirect_to" value="<?php echo home_url(); ?>"/>
</form>
<br />
<ul>
<?php if (is_multisite()) { ?>
- <li><a href="<?php bloginfo('url') ?>/wp-signup.php"><?php _e('Register','comicpress'); ?></a></li>
+ <li><a href="<?php echo home_url(); ?>/wp-signup.php"><?php _e('Register','comicpress'); ?></a></li>
<?php } else { ?>
- <li><a href="<?php bloginfo('url') ?>/wp-register.php"><?php _e('Register','comicpress'); ?></a></li>
+ <li><a href="<?php echo home_url(); ?>/wp-register.php"><?php _e('Register','comicpress'); ?></a></li>
<?php } ?>
- <li><a href="<?php bloginfo('url') ?>/wp-login.php?action=lostpassword"><?php _e('Recover password','comicpress'); ?></a></li>
+ <li><a href="<?php echo home_url(); ?>/wp-login.php?action=lostpassword"><?php _e('Recover password','comicpress'); ?></a></li>
</ul>
<?php } else { ?>
<ul>
- <?php $redirect = '&amp;redirect_to='.urlencode(wp_make_link_relative(get_bloginfo('wpurl')));
+ <?php $redirect = '&amp;redirect_to='.urlencode(wp_make_link_relative(site_url()));
$uri = wp_nonce_url( site_url("wp-login.php?action=logout$redirect", 'login'), 'log-out' ); ?>
<li><a href="<?php echo $uri; ?>"><?php _e('Logout','comicpress'); ?></a></li>
<?php wp_register(); ?>
- <li><a href="<?php bloginfo('url'); ?>/wp-admin/profile.php"><?php _e('Profile','comicpress'); ?></a></li>
+ <li><a href="<?php echo home_url(); ?>/wp-admin/profile.php"><?php _e('Profile','comicpress'); ?></a></li>
</ul>
<?php } ?>
<?php
@@ -80,7 +80,7 @@ function widget($args, $instance) {
$mode = !isset($this->text_fields[$instance['mode']]) ? array_shift(array_keys($this->text_fields)) : $instance['mode'];
- $link = is_home() ? get_bloginfo('url') : get_permalink($post);
+ $link = is_home() ? home_url() : get_permalink($post);
$id = 'comic-bookmark-' . md5(rand());
$elements = array();

0 comments on commit 111fbd1

Please sign in to comment.