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

fix after merge

This commit is contained in:
mindfaucet 2009-11-16 23:23:33 -07:00
parent b62cddac93
commit 58201bac4e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions/displayblogpost.php
View File

@ -31,10 +31,8 @@ function display_blog_post() {
</div>
<?php } ?>
<div class="post-text">
<<<<<<< HEAD
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
=======
<?php if (function_exists('the_post_image')) {
if ( has_post_image() ) { ?>
<div class="post-image">
@ -47,7 +45,6 @@ function display_blog_post() {
<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
<?php } ?>
<div class="post-author"> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?></div>
>>>>>>> c69449745f7d52edac293bde5fc32bd6a4d37a9d
<?php if ($disable_categories_in_posts != 'yes') { ?>
<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
<?php } ?>