From 2aab75080d46c65d31374f5cf1921337a750d73c Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Sat, 24 May 2014 13:42:35 +0200
Subject: [PATCH] Fixed a markup bug causing the twitter timeline to render
 wrong

---
 serendipity_plugin_twitter/ChangeLog                      | 4 ++++
 serendipity_plugin_twitter/plugin_version.inc.php         | 2 +-
 serendipity_plugin_twitter/serendipity_event_twitter.php  | 2 +-
 .../tweeter/tweeter_history.inc.php                       | 8 +++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/serendipity_plugin_twitter/ChangeLog b/serendipity_plugin_twitter/ChangeLog
index 3be8ea64..4b00e49c 100644
--- a/serendipity_plugin_twitter/ChangeLog
+++ b/serendipity_plugin_twitter/ChangeLog
@@ -9,6 +9,10 @@ TODO:
 * Twitter announcements/credentials etc. per author instead of
   only per central blog
 
+1.62
+--------------------------
+    * Fixed a markup bug for twitter timeline (yellowled)
+
 1.61
 --------------------------
     * Adapted backend markup (tweeter_client.inc.php) for 2.0 backend (yellowled)
diff --git a/serendipity_plugin_twitter/plugin_version.inc.php b/serendipity_plugin_twitter/plugin_version.inc.php
index 29ab3b85..73677e17 100644
--- a/serendipity_plugin_twitter/plugin_version.inc.php
+++ b/serendipity_plugin_twitter/plugin_version.inc.php
@@ -1,4 +1,4 @@
 <?php
 
 // Actual version of both plugins
-@define('PLUGIN_TWITTER_VERSION', '1.61');
+@define('PLUGIN_TWITTER_VERSION', '1.62');
diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php
index d5e68cd3..d424bab6 100644
--- a/serendipity_plugin_twitter/serendipity_event_twitter.php
+++ b/serendipity_plugin_twitter/serendipity_event_twitter.php
@@ -2143,7 +2143,7 @@ a.twitter_update_time {
                     $buffer .= '<li class="tweeter_line">
                                     <div class="tweeter_profile_img">
                                         <img src="'.$status->user->profile_image_url.'" width="48" height="48" alt="" title="' . $status->user->screen_name . '"/>
-                                    </div
+                                    </div>
                                     <div  class="tweeter_profile_text">
                                         <a href="' . $api->get_base_url() .$status->user->screen_name.'">'.$status->user->screen_name.'</a> '.$status->text.'
                                     </div>
diff --git a/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php b/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
index 5614256f..9bee8b77 100644
--- a/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
+++ b/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
@@ -5,8 +5,10 @@ if (IN_serendipity !== true) {
 ?>
 
 <ul id="serendipity_admin_tweeter_statuses">
-
 <?php echo $buffer; ?>
-
 </ul>
-<div class="tweeter_clearfix"></div>
\ No newline at end of file
+<?php
+    if ($GLOBALS['serendipity']['version'][0] == '1') {
+        echo '<div class="tweeter_clearfix"></div>';
+    }
+?>