From c1a33e910592ce4a0ca3c9bff050d6ca428172aa Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Mon, 16 Jul 2007 07:34:32 +0000
Subject: [PATCH] Backport

---
 docs/NEWS                           | 19 +++++++++++++------
 serendipity_config.inc.php          |  2 +-
 templates/default/admin/entries.tpl |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 400dd94..57addaf 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,16 +3,23 @@
 Version 1.2 ()
 ------------------------------------------------------------------------
 
-    * Stronger autologin cookie encryption, prevent mixup with template
-      options (which could make foreign users delete your configured
-      template option keys). Also use new serendpity_db_implode()
+    * (beta4) serendipity_plugin_comments now also supports Favatars in 
+      combination with serendipity_event_gravatar instead of
+      Gravatars only. (brockhaus)
+
+    * (beta4) Fix wrong event hook for entry manager to display toolbar
+      for the main body area.
+    
+    * (beta4) Stronger autologin cookie encryption, prevent mixup with 
+      template options (which could make foreign users delete your 
+      configured template option keys). Also use new serendpity_db_implode()
       function for a safer API on image handling. 
       All hail Stefan Esser. :)
 
-    * Backend templating changes to insert more classes to input fields
-      etc (Don Chambers)
+    * (beta4) Backend templating changes to insert more classes to input 
+      fields etc (Don Chambers)
 
-    * Fix invalid pingback XML code, by Slim
+    * (beta4) Fix invalid pingback XML code, by Slim
     
     * (beta2) Fix when saving personal configuration the userlevel and 
       "no_create" flags where not properly saved, thanks to PHPaws!
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index c235522..4424843 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -41,7 +41,7 @@ if (defined('USE_MEMSNAP')) {
 }
 
 // The version string
-$serendipity['version']         = '1.2-beta3';
+$serendipity['version']         = '1.2-beta4';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
diff --git a/templates/default/admin/entries.tpl b/templates/default/admin/entries.tpl
index 6bf7e91..ef08c31 100644
--- a/templates/default/admin/entries.tpl
+++ b/templates/default/admin/entries.tpl
@@ -107,11 +107,11 @@
                 document.write('<input type="button" class="serendipityPrettyButton input_button" value="Link" onclick="serendipity_insLink(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])">');
             </script>
             {/if}
-            {serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"}
+            {serendipity_hookPlugin hook="backend_entry_toolbar_body" data=$entry_data.entry hookAll="true"}
         </td>
         {else}
         <td colspan="2"><b>{$CONST.ENTRY_BODY}</b></td>
-        <td>{serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"}</td>
+        <td>{serendipity_hookPlugin hook="backend_entry_toolbar_body" data=$entry_data.entry hookAll="true"}</td>
         {/if}
     </tr>
     {*** ENTRY TOOLBAR END ***}
-- 
2.39.5