Ubuntu Insights

Merge lp:~foli/resource-centre/fix_php_warnings into lp:resource-centre

  1. fix_php_warnings
  2. Merge into resource-centre
Proposed by Michael Foley
Status: Merged
Merged at revision: 60
Proposed branch: lp:~foli/resource-centre/fix_php_warnings
Merge into: lp:resource-centre
Diff against target: 32 lines (+3/-3)
2 files modified
header.php (+2/-2)
single.php (+1/-1)
To merge this branch: bzr merge lp:~foli/resource-centre/fix_php_warnings
Reviewer Review Type Date Requested Status
Graham Bancroft (community) Approve
Review via email: mp+258578@code.launchpad.net

Description of the change

shortcodes causing syntax errors on a new deploy and upgrade

Also see merge proposal by Olivier:
https://code.launchpad.net/~olivier.fraysse/resource-centre/resource-centre/+merge/252208

This is one same fix as that, plus another I found.

To post a comment you must log in.
Revision history for this message
Graham Bancroft (gbancroft-canonical) wrote :

Lgtm :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'header.php'
2--- header.php 2015-04-08 15:42:57 +0000
3+++ header.php 2015-05-08 02:41:18 +0000
4@@ -26,7 +26,7 @@
5
6 <head>
7
8-<title><?php if (is_search()) : ?> <?php echo htmlentities($s,ENT_QUOTES,get_bloginfo('charset')); ?> <?php elseif (is_category()) : ?><?php $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); ?><?php if( $term != '' ) : ?><?php echo $term->name; ?><?php endif; ?> <?php echo strtolower(single_cat_title( '', false, 'right' )); ?><?php if(is_taxonomy('topic', 'category')) : endif ; ?><?php else : ?> <?php wp_title(''); ?><?php endif; ?> <?php if (!is_home()) : ?>|<? endif; ?> <?php bloginfo('name'); ?></title>
9+<title><?php if (is_search()) : ?> <?php echo htmlentities($s,ENT_QUOTES,get_bloginfo('charset')); ?> <?php elseif (is_category()) : ?><?php $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); ?><?php if( $term != '' ) : ?><?php echo $term->name; ?><?php endif; ?> <?php echo strtolower(single_cat_title( '', false, 'right' )); ?><?php if(is_taxonomy('topic', 'category')) : endif ; ?><?php else : ?> <?php wp_title(''); ?><?php endif; ?> <?php if (!is_home()) : ?>|<?php endif; ?> <?php bloginfo('name'); ?></title>
10
11 <meta charset="utf-8" />
12 <meta name="description" content="Ubuntu Insights - The Ubuntu resource center" />
13@@ -82,4 +82,4 @@
14 </header>
15
16 <div class="wrapper clearfix">
17-<div id="main-content" class="inner-wrapper clearfix" role="main">
18\ No newline at end of file
19+<div id="main-content" class="inner-wrapper clearfix" role="main">
20
21=== modified file 'single.php'
22--- single.php 2015-04-14 07:52:53 +0000
23+++ single.php 2015-05-08 02:41:18 +0000
24@@ -347,7 +347,7 @@
25 <?php if(get_the_author_meta('user_photo', $uid)) : ?><div><span class="image-wrap avatar" style="width: auto; height: auto;"><img src="<?php bloginfo('url'); ?><?php the_author_meta('user_photo',$uid); ?>" alt="<?php the_author_meta('first_name',$uid); ?>'s photo" class="avatar-156 photo" width="156" height="156" /></span></div><?php endif; ?>
26 <div><p><?php the_author_meta('first_name',$uid); ?> <?php the_author_meta('last_name',$uid); ?> is <?php if(get_the_author_meta('user_job_title', $uid)) : ?><span class="role"><?php the_author_meta('user_job_title',$uid); ?>.</span><?php endif; ?> <?php the_author_meta('user_description',$uid); ?></p>
27 <p><a href="<?php echo get_author_posts_url(get_the_author_meta( 'ID' )); ?>">More articles by <?php the_author_meta('first_name',$uid); ?></a></p></div>
28-</div><?php endif; ?><? endif; ?>
29+</div><?php endif; ?><?php endif; ?>
30 <?php get_template_part("includes/_cat_headings"); ?>
31
32 </div><!-- /.box -->

Subscribers

People subscribed via source and target branches