Permalink
Browse files

Merge branch 'master' into cache-backwards-compat

  • Loading branch information...
2 parents 4dcfd46 + caf7803 commit c326e76272559d64c0ef30942585f25f7b0afe38 @rmccue rmccue committed Oct 11, 2012
Showing with 13 additions and 4 deletions.
  1. +2 −3 .travis.yml
  2. +11 −1 demo/index.php
View
5 .travis.yml
@@ -4,6 +4,5 @@ php:
- 5.3
- 5.4
branches:
- only:
- - master
- - one-dot-three
+ except:
+ - one-dot-two
View
12 demo/index.php
@@ -196,7 +196,17 @@
<div class="chunk focus" align="center">
<!-- If the feed has a link back to the site that publishes it (which 99% of them do), link the feed's title to it. -->
- <h3 class="header"><?php if ($feed->get_link()) echo '<a href="' . $feed->get_link() . '">'; echo $feed->get_title(); if ($feed->get_link()) echo '</a>'; ?></h3>
+ <h3 class="header">
+ <?php
+ $link = $feed->get_link();
+ $title = $feed->get_title();
+ if ($link)
+ {
+ $title = "<a href='$link' title='$title'>$title</a>";
+ }
+ echo $title;
+ ?>
+ </h3>
<!-- If the feed has a description, display it. -->
<?php echo $feed->get_description(); ?>

0 comments on commit c326e76

Please sign in to comment.