Merge branch 'master' of github.com:johnbintz/comicpress-2.8

This commit is contained in:
John Bintz 2009-11-21 13:43:18 -05:00
commit 4f88295bb0
2 changed files with 2 additions and 2 deletions

View File

@ -10,7 +10,7 @@
<?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?> <?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?>
<p> <p>
<span class="footer-copyright"> <span class="footer-copyright">
<?php echo cp_copyright(); ?> <?php echo comicpress_copyright(); ?>
<?php if (empty($wpmu_version)) { <?php if (empty($wpmu_version)) {
$authorfirstname = get_the_author_meta('firstname',1); $authorfirstname = get_the_author_meta('firstname',1);
$authorlastname = get_the_author_meta('lastname',1); $authorlastname = get_the_author_meta('lastname',1);

View File

@ -851,7 +851,7 @@ function comicpress_is_active_sidebar( $index ) {
return false; return false;
} }
function cp_copyright() { function comicpress_copyright() {
global $wpdb; global $wpdb;
$copyright_dates = $wpdb->get_results(" $copyright_dates = $wpdb->get_results("
SELECT SELECT