canonical blog

Merge lp:~jacekn/canonical-blog/canonical-blog-fixes2 into lp:canonical-blog

  1. canonical-blog-fixes2
  2. Merge into trunk
Proposed by Jacek Nykis
Status: Merged
Approved by: Anthony Dillon
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~jacekn/canonical-blog/canonical-blog-fixes2
Merge into: lp:canonical-blog
Diff against target: 23 lines (+0/-2)
2 files modified
archive.php (+0/-1)
archives.php (+0/-1)
To merge this branch: bzr merge lp:~jacekn/canonical-blog/canonical-blog-fixes2
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+277129@code.launchpad.net

Description of the change

Two more fixes

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Guess these landed before reviews were standard. +1 thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'archive.php'
2--- archive.php 2015-11-10 13:43:07 +0000
3+++ archive.php 2015-11-10 14:05:53 +0000
4@@ -64,7 +64,6 @@
5 <h3><a href="<?php the_permalink() ?>"><?php if (get_post_type() == 'post') { echo 'Blog: '; } else { $post_type = get_post_type_object(get_post_type($post)); echo $post_type->labels->singular_name, ': '; } ?><?php the_title(); ?></a></h3>
6 <p class="article-meta"><span class="off-left">Posted by </span><a href="<?php echo get_author_posts_url(get_the_author_meta( 'ID' )); ?>"><strong><?php if(get_the_author_meta('first_name') == '') { ?><?php if(the_author_meta('display_name')) ?><?php } else { ?><?php if(the_author_meta('first_name')) ?> <?php if(the_author_meta('last_name')) ?><?php } ?> </strong></a> on <time datetime="<?php the_time('Y-m-d') ?>"><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
7 <?php the_excerpt(); ?>
8- <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
9 </article>
10 </li>
11 <?php endwhile; ?>
12
13=== modified file 'archives.php'
14--- archives.php 2015-11-10 13:43:07 +0000
15+++ archives.php 2015-11-10 14:05:53 +0000
16@@ -64,7 +64,6 @@
17 <h3><a href="<?php the_permalink() ?>"><?php if (get_post_type() == 'post') { echo 'Blog: '; } else { $post_type = get_post_type_object(get_post_type($post)); echo $post_type->labels->singular_name, ': '; } ?><?php the_title(); ?></a></h3>
18 <p class="article-meta"><span class="off-left">Posted by </span><a href="<?php echo get_author_posts_url(get_the_author_meta( 'ID' )); ?>"><strong><?php if(get_the_author_meta('first_name') == '') { ?><?php if(the_author_meta('display_name')) ?><?php } else { ?><?php if(the_author_meta('first_name')) ?> <?php if(the_author_meta('last_name')) ?><?php } ?> </strong></a> on <time datetime="<?php the_time('Y-m-d') ?>"><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
19 <?php the_excerpt(); ?>
20- <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
21 </article>
22 </li>
23 <?php endwhile;?>

Subscribers

People subscribed via source and target branches