Merge lp:~jacekn/blahblahblah/fixes3 into lp:blahblahblah

Proposed by Jacek Nykis
Status: Merged
Approved by: Anthony Dillon
Approved revision: 57
Merged at revision: 53
Proposed branch: lp:~jacekn/blahblahblah/fixes3
Merge into: lp:blahblahblah
Diff against target: 165 lines (+8/-21)
10 files modified
comments.php (+0/-1)
header.php (+1/-3)
includes/_nav_archive.php (+2/-2)
includes/_popular_posts.php (+1/-1)
includes/_result_list_item.php (+0/-1)
index.php (+1/-2)
launchpad_comments.php (+0/-1)
search.php (+0/-1)
single.php (+2/-6)
team.php (+1/-3)
To merge this branch: bzr merge lp:~jacekn/blahblahblah/fixes3
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Jacek Nykis (community) Needs Resubmitting
Robin Winslow Approve
Review via email: mp+278134@code.launchpad.net

Description of the change

Multiple PHP tab fixes

To post a comment you must log in.
lp:~jacekn/blahblahblah/fixes3 updated
56. By Jacek Nykis

Whitespace fix to make title appear on one line

Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good, two comments in code to remove commented out code.

review: Needs Fixing
Revision history for this message
Robin Winslow (nottrobin) wrote :

LGTM

review: Approve
lp:~jacekn/blahblahblah/fixes3 updated
57. By Jacek Nykis

Removed 2 lines which were comments only

Revision history for this message
Jacek Nykis (jacekn) wrote :

Good point ant, branch updated

review: Needs Resubmitting
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'comments.php'
2--- comments.php 2012-11-04 11:12:22 +0000
3+++ comments.php 2015-11-20 14:58:00 +0000
4@@ -108,7 +108,6 @@
5 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>
6 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>
7 </li>
8- <!-- <li><p><strong>XHTML:</strong> You can use these tags: <code><?#php echo allowed_tags(); ?></code></p></li> -->
9 <li>
10 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>
11 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
12
13=== modified file 'header.php'
14--- header.php 2013-03-01 09:53:38 +0000
15+++ header.php 2015-11-20 14:58:00 +0000
16@@ -30,9 +30,7 @@
17 <!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
18 <head>
19
20-<title>
21-<?php if(is_author()) : ?>
22-<?php
23+<title><?php if(is_author()) : ?><?php
24 $curauth = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author));
25 echo $curauth->first_name; ?> <?php echo $curauth->last_name;
26 ?> | Ubuntu <?php bloginfo('name'); ?> Blog
27
28=== modified file 'includes/_nav_archive.php'
29--- includes/_nav_archive.php 2012-10-26 21:17:51 +0000
30+++ includes/_nav_archive.php 2015-11-20 14:58:00 +0000
31@@ -7,7 +7,7 @@
32 <li class="year"><h3><a href="<?php echo get_year_link($year); ?> "><?php echo $year; ?></a></h3>
33
34 <ul id="" class="no-bullets">
35- <? $months = $wpdb->get_col("SELECT DISTINCT MONTH(post_date) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' AND YEAR(post_date) = '".$year."' ORDER BY post_date DESC");
36+ <?php $months = $wpdb->get_col("SELECT DISTINCT MONTH(post_date) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' AND YEAR(post_date) = '".$year."' ORDER BY post_date DESC");
37 foreach($months as $month) :
38 ?>
39 <li class=""><a href="<?php echo get_month_link($year, $month); ?>"><?php echo date( 'F', mktime(0, 0, 0, $month) );?>
40@@ -19,4 +19,4 @@
41 </ul>
42 </li>
43 <?php endforeach; ?>
44-</ul>
45\ No newline at end of file
46+</ul>
47
48=== modified file 'includes/_popular_posts.php'
49--- includes/_popular_posts.php 2012-10-26 21:17:51 +0000
50+++ includes/_popular_posts.php 2015-11-20 14:58:00 +0000
51@@ -9,7 +9,7 @@
52 $commentcount = $post->comment_count;
53 if ($commentcount != 0) { ?>
54 <li><a href="<?php echo get_permalink($postid); ?>" title="<?php echo $title ?>">
55- <?php echo $title ?><?#php echo $commentcount ?></a></li>
56+ <?php echo $title ?></a></li>
57 <?php } } ?>
58 </ul>
59 </<?php if (is_home() ) { echo 'li'; } else { echo 'div'; } ?>><!-- /#popular-posts -->
60
61=== modified file 'includes/_result_list_item.php'
62--- includes/_result_list_item.php 2012-10-26 21:17:51 +0000
63+++ includes/_result_list_item.php 2015-11-20 14:58:00 +0000
64@@ -3,6 +3,5 @@
65 <h2><a href="<?php the_permalink() ?>"><?php the_title(); ?></a></h2>
66 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
67 <?php the_excerpt(); ?>
68- <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
69 </article>
70 </li>
71
72=== modified file 'index.php'
73--- index.php 2012-10-30 13:10:59 +0000
74+++ index.php 2015-11-20 14:58:00 +0000
75@@ -97,7 +97,6 @@
76 </li>
77 <?php if(is_home() && !is_paged() && $postCount == 3) { get_template_part("tweet"); } // include tweet ?>
78 <?php endwhile;?>
79-<?#php else : ?>
80 <?php endif; // if have_posts ends
81 wp_reset_query();
82 ?>
83@@ -105,4 +104,4 @@
84 </div><!-- /#articles -->
85
86 <?php // get_sidebar(); ?>
87-<?php get_footer(); ?>
88\ No newline at end of file
89+<?php get_footer(); ?>
90
91=== modified file 'launchpad_comments.php'
92--- launchpad_comments.php 2013-03-08 12:37:09 +0000
93+++ launchpad_comments.php 2015-11-20 14:58:00 +0000
94@@ -108,7 +108,6 @@
95 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>
96 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>
97 </li>
98- <!-- <li><p><strong>XHTML:</strong> You can use these tags: <code><?#php echo allowed_tags(); ?></code></p></li> -->
99 <li>
100 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>
101 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
102
103=== modified file 'search.php'
104--- search.php 2012-10-31 16:09:07 +0000
105+++ search.php 2015-11-20 14:58:00 +0000
106@@ -34,7 +34,6 @@
107 <h2><a href="<?php the_permalink() ?>"><?php echo $title; ?></a></h2>
108 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
109 <?php echo $excerpt; ?>
110- <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
111 </article>
112 </li>
113 <?php endwhile; ?>
114
115=== modified file 'single.php'
116--- single.php 2013-05-24 14:26:14 +0000
117+++ single.php 2015-11-20 14:58:00 +0000
118@@ -69,7 +69,6 @@
119 ?>
120 </li>
121 </ul>
122- <!-- <p><?#php comments_popup_link('there are currently no comments', 'there is currently 1 comment', 'there are currently % comments'); ?>.</p> -->
123 <div id="share-links">
124 <h3>Share this article:</h3>
125 <ul id="social-links" class="no-bullets">
126@@ -120,7 +119,7 @@
127 <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a>
128 <span class="clearfix">by <a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></span>
129 </li>
130-<? }
131+<?php }
132 echo '</ul>';
133 echo '</div><!-- /.six-col -->';
134 echo '</div><!-- /.wrapper -->';
135@@ -129,9 +128,7 @@
136 }
137 $post = $orig_post;
138 wp_reset_query(); ?>
139- <?#php comments_rss_link('&raquo; Comments RSS Feed'); ?>
140 <?php endwhile; // while have_posts ends ?>
141- <?#php else : ?>
142 <?php endif; // if have_posts ends ?>
143 <div class="section-wrapper<?php if (get_comments_number()==0) { echo ' no-comments'; } ?><?php $tags = wp_get_post_tags($post->ID); if ($tags) { echo ' has-related'; } ?>">
144 <div class="wrapper">
145@@ -141,5 +138,4 @@
146 </div><!-- /.wrapper -->
147 </div><!-- /.section-wrapper -->
148 </section>
149-<?#php get_sidebar(); ?>
150-<?php get_footer(); ?>
151\ No newline at end of file
152+<?php get_footer(); ?>
153
154=== modified file 'team.php'
155--- team.php 2012-10-26 21:17:51 +0000
156+++ team.php 2015-11-20 14:58:00 +0000
157@@ -70,6 +70,4 @@
158 </ul>
159 </div>
160
161-<?#php get_sidebar(); ?>
162-
163-<?php get_footer(); ?>
164\ No newline at end of file
165+<?php get_footer(); ?>

Subscribers

People subscribed via source and target branches