From: garvinhicking <garvinhicking>
Date: Mon, 26 Sep 2005 13:24:02 +0000 (+0000)
Subject: Prepare 0.8.5 release
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4f48d6cc52cf54c408ae55efcad16f975a835d53;p=s9y.git

Prepare 0.8.5 release
---

diff --git a/deployment/serendipity_editor.js b/deployment/serendipity_editor.js
index 5d246fe..f4003b2 100644
--- a/deployment/serendipity_editor.js
+++ b/deployment/serendipity_editor.js
@@ -1,5 +1,5 @@
 <!-- // Hide from older browsers
-/* $Id$
+/* $Id$ */
 /*
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
@@ -139,11 +139,14 @@ function serendipity_imageSelector_addToElement (str, el)
 {
     document.getElementById(el).value = str;
     document.getElementById(el).focus();
+	if (document.getElementById(el).onchange) {
+	    document.getElementById(el).onchange();
+    }
 }
 
 function serendipity_imageSelector_addToBody (str, textarea)
 {
-    document.forms['serendipityEntry']['serendipity['+ textarea +']'].value += str;
+	wrapSelection(document.forms['serendipityEntry']['serendipity['+ textarea +']'], str, '');
     document.forms['serendipityEntry']['serendipity['+ textarea +']'].focus();
 }
 
diff --git a/docs/NEWS b/docs/NEWS
index 7575207..661442e 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,9 +3,28 @@
 Version 0.8.5 ()
 ------------------------------------------------------------------------
 
+    * More Security: When changing the password in your personal preferences,
+      you need to insert the old password. Thanks to Nenad Jovanovic for
+      contacting me about this issue! (garvinhicking)
+
+    * Fix JS errors in admin comment overview for IE6 (garvinhicking)
+
+    * Fix showing any entry-id related sidebar plugins, when a selected
+      entry is not visible (permissions/drafts/...) by unsetting the
+      global $serendipity['GET']['id'] in that case. (garvinhicking)
+
+    * Fix "DATA_TRACKBACK_APPROVED" showing of constants when approving
+      trackbacks/comments instead of the properly formatted message.
+      (Would've required a template change for a "pretty solution", but
+       the current fix is a BC-compatible fix by defining constants a bit
+       differently) (garvinhicking)
+
     * Default Admin Stylesheet no longer uses direct height: assignment,
       but padding instead. This should get rid of occasional overlapping 
       of menu items. Thanks a lot to Ognyan Kulev for the solution to this!
+      
+    * Fix putting sticky entry on the last page in postgreSQL setups.
+      Thanks to Nate Johnston for working this out! (garvinhicking)
 
     * Fix file upload bug which limited upload filesize to 3 million bytes
       (2.86MB) regardless of PHP configuration. Maximum upload filesize
diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index d71545d..b71edec 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -164,7 +164,7 @@ $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}
                                 ORDER BY c.id DESC $limit");
 ?>
 <script type="text/javascript">
-function toggle(id) {
+function FT_toggle(id) {
     if ( document.getElementById(id + '_full').style.display == '' ) {
         document.getElementById(id + '_full').style.display='none';
         document.getElementById(id + '_summary').style.display='';
@@ -352,10 +352,10 @@ foreach ($sql as $rs) {
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
 <?php } ?>
 <?php if (strlen($fullBody) > strlen($summary) ) { ?>
-          <a href="#c<?php echo $rs['id'] ?>" onclick="toggle(<?php echo $rs['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><span id="<?php echo $rs['id'] ?>_text"><?php echo VIEW ?></span></a>
+          <a href="#c<?php echo $rs['id'] ?>" onclick="FT_toggle(<?php echo $rs['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><span id="<?php echo $rs['id'] ?>_text"><?php echo VIEW ?></span></a>
 <?php } ?>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
+          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
     </td>
 </tr>
 <tr>
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index ba77398..a9b6dda 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -8,8 +8,8 @@ if (IN_serendipity !== true) {
 
 switch ($serendipity['GET']['adminAction']) {
     case 'sync':
-        set_time_limit(0);
-        ignore_user_abort();
+        @set_time_limit(0);
+        @ignore_user_abort();
 
         echo '<p><b>' . SYNCING . '</b><br /><br />';
         flush();
diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php
index 1a96a65..c3d8823 100644
--- a/include/admin/import.inc.php
+++ b/include/admin/import.inc.php
@@ -30,7 +30,7 @@ class Serendipity_Import {
         }
 
         if (LANG_CHARSET != 'ISO-8859-1') {
-            $charset['ISO-8859-1'] = 'ISO-8859-1';
+            $charsets['ISO-8859-1'] = 'ISO-8859-1';
         }
         
         if ($utf8_default) {
diff --git a/include/admin/personal.inc.php b/include/admin/personal.inc.php
index dfe1d20..ce4419e 100644
--- a/include/admin/personal.inc.php
+++ b/include/admin/personal.inc.php
@@ -12,6 +12,8 @@ if ( $serendipity['GET']['adminAction'] == 'save' ) {
     $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
     if ((int)$_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</div>';
+    } elseif (!empty($_POST['password']) && $_POST['check_password'] != $_SESSION['serendipityPassword'] && md5($_POST['check_password']) != $_SESSION['serendipityPassword']) {
+        echo '<div class="serendipityAdminMsgError">' . USERCONF_CHECK_PASSWORD_ERROR . '</div>';
     } else {
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 7d353d2..1b3abff 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -453,6 +453,9 @@ function serendipity_header($header) {
 function serendipity_getSessionLanguage() {
     global $serendipity;
 
+    // Store default language
+    $serendipity['default_lang'] = $serendipity['lang'];
+
     if ($_SESSION['serendipityAuthedUser']) {
         serendipity_header('X-Serendipity-InterfaceLangSource: Database');
         return $serendipity['lang'];
diff --git a/include/genpage.inc.php b/include/genpage.inc.php
index 30686e2..2a6eeb5 100644
--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@@ -28,7 +28,13 @@ if ($serendipity['smarty_raw_mode']) {
         // User wants to read the diary
         case 'read':
             if (isset($serendipity['GET']['id'])) {
-                serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
+                $entry = array(serendipity_fetchEntry('id', $serendipity['GET']['id']));
+                if (!is_array($entry) || count($entry) < 1) {
+                    unset($serendipity['GET']['id']);
+                    $entry = array(array());
+                }
+
+                serendipity_printEntries($entry, 1);
             } else {
                 serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, $serendipity['fetchLimit']));
             }
diff --git a/include/tpl/config_personal.inc.php b/include/tpl/config_personal.inc.php
index 26f4f15..b9315d0 100644
--- a/include/tpl/config_personal.inc.php
+++ b/include/tpl/config_personal.inc.php
@@ -22,6 +22,13 @@
                                           'default'     => '',
                                           'userlevel'   => USERLEVEL_EDITOR),
 
+                                    array('var'         => 'check_password',
+                                          'title'       => USERCONF_CHECK_PASSWORD,
+                                          'description' => USERCONF_CHECK_PASSWORD_DESC,
+                                          'type'        => 'protected',
+                                          'default'     => '',
+                                          'permission'  => 'personalConfiguration'),
+
                                     array('var'         => 'realname',
                                           'title'       => USERCONF_REALNAME,
                                           'description' => USERCONF_REALNAME_DESC,
diff --git a/include/tpl/htaccess_cgi_errordocs.tpl b/include/tpl/htaccess_cgi_errordocs.tpl
index c69a7d1..1895514 100644
--- a/include/tpl/htaccess_cgi_errordocs.tpl
+++ b/include/tpl/htaccess_cgi_errordocs.tpl
@@ -2,6 +2,10 @@
 ErrorDocument 404 {PREFIX}{indexFile}
 DirectoryIndex {PREFIX}{indexFile}
 
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/include/tpl/htaccess_cgi_normal.tpl b/include/tpl/htaccess_cgi_normal.tpl
index 85a6a75..8e5b3bc 100644
--- a/include/tpl/htaccess_cgi_normal.tpl
+++ b/include/tpl/htaccess_cgi_normal.tpl
@@ -1,5 +1,10 @@
 # BEGIN s9y
 DirectoryIndex {PREFIX}{indexFile}
+
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/include/tpl/htaccess_cgi_rewrite.tpl b/include/tpl/htaccess_cgi_rewrite.tpl
index 860c2f0..2a71826 100644
--- a/include/tpl/htaccess_cgi_rewrite.tpl
+++ b/include/tpl/htaccess_cgi_rewrite.tpl
@@ -22,6 +22,10 @@ RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/include/tpl/htaccess_errordocs.tpl b/include/tpl/htaccess_errordocs.tpl
index 7477fb3..32c4b3c 100644
--- a/include/tpl/htaccess_errordocs.tpl
+++ b/include/tpl/htaccess_errordocs.tpl
@@ -4,6 +4,10 @@ DirectoryIndex {PREFIX}{indexFile}
 php_value session.use_trans_sid 0
 php_value register_globals off
 
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/include/tpl/htaccess_normal.tpl b/include/tpl/htaccess_normal.tpl
index 73c3a94..7bb21a4 100644
--- a/include/tpl/htaccess_normal.tpl
+++ b/include/tpl/htaccess_normal.tpl
@@ -2,6 +2,11 @@
 DirectoryIndex {PREFIX}{indexFile}
 php_value session.use_trans_sid 0
 php_value register_globals off
+
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/include/tpl/htaccess_rewrite.tpl b/include/tpl/htaccess_rewrite.tpl
index 6e863a4..2313f64 100644
--- a/include/tpl/htaccess_rewrite.tpl
+++ b/include/tpl/htaccess_rewrite.tpl
@@ -24,6 +24,10 @@ RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
+<Files *.tpl.php>
+    deny from all
+</Files>
+
 <Files *.tpl>
     deny from all
 </Files>
diff --git a/index.php b/index.php
index 8ff6249..e31b772 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@ if (isset($_SERVER['HTTP_REFERER']) && empty($_SESSION['HTTP_REFERER'])) {
 
 if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) {
     if (serendipity_cancelSubscription(urldecode($res[1]), $res[2])) {
-        define('DATA_UNSUBSCRIBED', urldecode($res[1]));
+        define('DATA_UNSUBSCRIBED', sprintf(UNSUBSCRIBE_OK, urldecode($res[1])));
     }
 
     $uri = '/' . PATH_UNSUBSCRIBE . '/' . $res[2] . '-untitled.html';
@@ -43,17 +43,19 @@ if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) {
 
 if (preg_match(PAT_DELETE, $uri, $res) && $serendipity['serendipityAuthedUser'] === true) {
     if ($res[1] == 'comment' && serendipity_deleteComment($res[2], $res[3], 'comments')) {
-        define('DATA_COMMENT_DELETED', $res[2]);
+        define('DATA_COMMENT_DELETED', sprintf(COMMENT_DELETED, $res[2]));
     } elseif ( $res[1] == 'trackback' && serendipity_deleteComment($res[2], $res[3], 'trackbacks') ) {
-        define('DATA_TRACKBACK_DELETED', $res[2]);
+        define('DATA_TRACKBACK_DELETED', sprintf(TRACKBACK_DELETED, $res[2]));
     }
 }
 
 if (preg_match(PAT_APPROVE, $uri, $res) && $serendipity['serendipityAuthedUser'] === true) {
     if ($res[1] == 'comment' && serendipity_approveComment($res[2], $res[3])) {
-        define('DATA_COMMENT_APPROVED', $res[2]);
+        define('DATA_COMMENT_APPROVED', sprintf(COMMENT_APPROVED, $res[2]));
+        define('DATA_TRACKBACK_APPROVED', false);
     } elseif ($res[1] == 'trackback' && serendipity_approveComment($res[2], $res[3])) {
-        define('DATA_TRACKBACK_APPROVED', $res[2]);
+        define('DATA_COMMENT_APPROVED', false);
+        define('DATA_TRACKBACK_APPROVED', sprintf(TRACKBACK_APPROVED, $res[2]));
     }
 }
 
diff --git a/lang/addlang.txt b/lang/addlang.txt
index 9e0c4b4..3df2350 100644
--- a/lang/addlang.txt
+++ b/lang/addlang.txt
@@ -1 +1,3 @@
-@define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php
index dee9d67..be9375e 100644
--- a/lang/serendipity_lang_bg.inc.php
+++ b/lang/serendipity_lang_bg.inc.php
@@ -654,3 +654,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index 285aff2..66df019 100644
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index 4bc7da2..8303942 100644
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -670,3 +670,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index d1102bb..1b9985e 100644
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -670,3 +670,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index 29082d5..cbefc29 100644
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -669,3 +669,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index b0ae73f..0b212c1 100644
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index 180fdc7..de1c47b 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -667,3 +667,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index 596331c..268869c 100644
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -673,3 +673,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index 2ec21c7..38734af 100644
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -669,3 +669,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index 4529ded..8dadc6d 100644
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -667,3 +667,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index c94d6b3..6ee837e 100644
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -675,3 +675,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'Cela configure l\'adresse mail qui sera utilisée dans la partie "Expediteur" des messages sortant. Assurez-vous que l\'adresse soit reconnue par le serveur de mail utilisé par votre hote - Beaucoup de serveur de mails rejettent les mails qui ont des adresses d\'expediteurs inconnues.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index 214610b..aac278e 100644
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -667,3 +667,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index 36d360f..06d845b 100644
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -669,3 +669,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index 29cdc62..5e8edd2 100644
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -669,3 +669,6 @@ Serendipity のアップグレードステージを無視しました。正し
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 43e92a0..0f19c32 100644
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -669,3 +669,6 @@
 @define('INSTALL_BLOG_EMAIL', '블로그의 전자우편 주소');
 @define('INSTALL_BLOG_EMAIL_DESC', '발송하는 전자우편의 "보낸 사람" 부분에 나타날 전자우편 주소를 설정합니다. 호스트의 메일 서버에서 인식하는 주소로 반드시 설정하십시오. 상당수의 메일 서버는 보낸 사람 주소를 알 수 없는 전자우편을 거부합니다.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index aa0bbba..1b92b66 100644
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -670,3 +670,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index 1842491..383f9b7 100644
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -670,3 +670,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index 865a8ff..7aa1b0e 100644
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -670,3 +670,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index 24e851d..b4228df 100644
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 4654ee9..333754d 100644
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -669,3 +669,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 5e7f5bc..36713ed 100644
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php
index 9cda2e0..e5a8a31 100644
--- a/lang/serendipity_lang_tw.inc.php
+++ b/lang/serendipity_lang_tw.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index d90ee38..cf2e482 100644
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -668,3 +668,6 @@
 @define('INSTALL_BLOG_EMAIL', 'Blog\'s E-Mail address');
 @define('INSTALL_BLOG_EMAIL_DESC', 'This configures the E-Mail address that is used as the "From"-Part of outgoing mails. Be sure to set this to an address that is recognized by the mailserver used on your host - many mailservers reject messages that have unknown From-addresses.');
 @define('XMLRPC_NO_LONGER_BUNDLED', 'The XML-RPC API Interface to Serendipity is no longer bundled because of ongoing security issues with this API and not many people using it. Thus you need to install the XML-RPC Plugin to use the XML-RPC API. The URL to use in your applications will NOT change - as soon as you have installed the plugin, you will again be able to use the API.');
+@define('USERCONF_CHECK_PASSWORD', 'Old Password');
+@define('USERCONF_CHECK_PASSWORD_DESC', 'If you change the password in the field above, you need to enter the current user password into this field.');
+@define('USERCONF_CHECK_PASSWORD_ERROR', 'You did not specify the right old password, and are not authorized to change the new password. Your settings were not saved.');
diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
index 670d9f2..dd3ebd4 100644
--- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
+++ b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
@@ -410,7 +410,16 @@ class serendipity_event_entryproperties extends serendipity_event
                         $eventData['addkey'] .= $cond;
                     }
 
-                    $cond = 'orderkey DESC';
+                    if ($serendipity['dbType'] == 'postgres') {
+                        // PostgreSQL is a bit weird here. Empty columns with NULL or "" content for 
+                        // orderkey would get sorted on top when using DESC, and only after those 
+                        // the "true" content would be inserted. Thus we order ASC in postgreSQL, 
+                        // and silently wonder. Thanks to Nate Johnston for working this out!
+                        $cond = 'orderkey ASC';
+                    } else {
+                        $cond = 'orderkey DESC';
+                    }
+
                     if (empty($eventData['orderby'])) {
                         $eventData['orderby'] = $cond;
                     } else {
@@ -419,16 +428,16 @@ class serendipity_event_entryproperties extends serendipity_event
 
                     $joins = array();
                     if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) {
-                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_extended
+                        $joins[] = " LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_extended
                                                  ON (e.id = ep_cache_extended.entryid AND ep_cache_extended.property = 'ep_cache_extended')";
-                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_body
+                        $joins[] = " LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_body
                                                  ON (e.id = ep_cache_body.entryid AND ep_cache_body.property = 'ep_cache_body')";
                     }
-                    $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_access
+                    $joins[] = " LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_access
                                              ON (e.id = ep_access.entryid AND ep_access.property = 'ep_access')";
 
                     if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
-                        $joins[] = "LEFT JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky
+                        $joins[] = " LEFT JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky
                                                  ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')";
                     }
 
diff --git a/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php b/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php
index a90233b..77653a0 100644
--- a/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php
+++ b/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php
@@ -29,7 +29,7 @@ class serendipity_event_livesearch extends serendipity_event
         $propbag->add('description',   PLUGIN_EVENT_LIVESEARCH_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Christian Stocker, Garvin Hicking');
-        $propbag->add('version',       '1.0');
+        $propbag->add('version',       '1.3');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
@@ -109,7 +109,7 @@ class serendipity_event_livesearch extends serendipity_event
 
                 case 'quicksearch_plugin':
                     echo '<script type="text/javascript">
-                    lsbase = "' . $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/ls' . ($serendipity['rewrite'] == 'none' ? '&' : '?') . '";
+                    lsbase = "' . $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/ls' . ($serendipity['rewrite'] == 'none' ? '_&' : '?') . '";
                     waittext = "' . PLUGIN_EVENT_LIVESEARCH_WAIT . '";
                     addLoadEvent(liveSearchInit);
                     </script>';
@@ -130,11 +130,6 @@ class serendipity_event_livesearch extends serendipity_event
                     }
 
                     $parts     = explode('_', $uri_parts[0]);
-                    if (!empty($parts[1])) {
-                        $param     = (int) $parts[1];
-                    } else {
-                        $param     = null;
-                    }
 
                     switch($parts[0]) {
                         case 'ls-js':
@@ -145,15 +140,18 @@ class serendipity_event_livesearch extends serendipity_event
                         case 'ls':
                             $res = serendipity_searchEntries($_REQUEST['s']);
 
+                            echo '<?xml version="1.0" encoding="utf-8" ?>';
+                            echo '<div class="serendipity_livesearch_result">';
+
                             if (is_array($res) && count($res) > 0) {
-                                echo '<?xml version="1.0" encoding="utf-8" ?>';
-                                echo '<div class="serendipity_livesearch_result">';
                                 foreach($res AS $id => $entry) {
                                     echo '<div class="serendipity_livesearch_row"><a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL') . '">' . htmlspecialchars($entry['title']) . '</a></div>';
                                 }
-                                echo '</div>';
+                            } else {
+                                echo '<div class="serendipity_livesearch_row">' . print_r($res, true) . '</div>';
                             }
 
+                            echo '</div>';
                             break;
                     }
 
diff --git a/serendipity_admin_image_selector.php b/serendipity_admin_image_selector.php
index 0295eea..460d245 100644
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@@ -80,7 +80,7 @@ switch ($serendipity['GET']['step']) {
         }
 
         $file           = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $file['imgsrc'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $file['imgsrc'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         if ($file['hotlink']) {
             $imgName    = $file['path'];
         } else {
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index fdbab1c..782c680 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '0.8.5-dev';
+$serendipity['version']         = '0.8.5';
 
 // Name of folder for the default theme
 $serendipity['defaultTemplate'] = 'default';
@@ -194,11 +194,17 @@ if (defined('IN_installer') && IS_installed === false) {
  *   include path
  */
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
-    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+    $local_config = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php';
 } elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
-    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
+    $local_config = $serendipity['serendipityPath'] . '/serendipity_config_local.inc.php';
 } else {
-    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
+    $local_config = S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php';
+}
+
+if (is_readable($local_config)) {
+    include_once($local_config);
+} else {
+    serendipity_die(sprintf(INCLUDE_ERROR, $local_config));
 }
 
 define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled'], '<='));
diff --git a/serendipity_editor.js b/serendipity_editor.js
index 4918d30..f4003b2 100644
--- a/serendipity_editor.js
+++ b/serendipity_editor.js
@@ -139,12 +139,14 @@ function serendipity_imageSelector_addToElement (str, el)
 {
     document.getElementById(el).value = str;
     document.getElementById(el).focus();
-    document.getElementById(el).onchange();
+	if (document.getElementById(el).onchange) {
+	    document.getElementById(el).onchange();
+    }
 }
 
 function serendipity_imageSelector_addToBody (str, textarea)
 {
-    document.forms['serendipityEntry']['serendipity['+ textarea +']'].value += str;
+	wrapSelection(document.forms['serendipityEntry']['serendipity['+ textarea +']'], str, '');
     document.forms['serendipityEntry']['serendipity['+ textarea +']'].focus();
 }