Backport

diff --git a/docs/NEWS b/docs/NEWS
index 400dd94e66c301aa9f830feee0f9f7ed79b8e9c9..57addaf52ad53bdd57b0c885e070a6a49cf04138 100644 (file)
--- 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 c235522e9dc6446c144b50daa18a62ab4912994b..44248437d197de6fe987d736654090cd2335df37 100644 (file)
--- 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 6bf7e91e0259bad739cd70086f44eb5ba0bb1dc6..ef08c31e4f8bc398a36f2da6e8da71f15828b667 100644 (file)
--- 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 ***}