mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Ian
2015-01-15 17:34:27 +01:00
parent 4858687501 a8e61fe115
commit 78d7c4984c
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/NEWS
View File

@@ -3,6 +3,12 @@
Version 2.0 () Version 2.0 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Prevent entryproperties from saving/displaying a browser-side
stored password that was actually not set.
* Stronger check for existing logger interface to prevent errors
when it is not actively used.
* Fix entryproperties being removed when publishing an article * Fix entryproperties being removed when publishing an article
from the dashboard and by specific plugins (freetag, trackback) from the dashboard and by specific plugins (freetag, trackback)
that modify entry data. that modify entry data.

2
include/functions_trackbacks.inc.php
View File

@@ -838,7 +838,7 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f
$query .= (int)$id . ", '" . $i_link . "', '" . $i_location . "')"; $query .= (int)$id . ", '" . $i_link . "', '" . $i_location . "')";
$ins = serendipity_db_query($query); $ins = serendipity_db_query($query);
if (is_string($ins)) { if (is_string($ins)) {
$serendipity['logger']->debug($ins); if (is_object($serendipity['logger'])) $serendipity['logger']->debug($ins);
} }
$old_references[] = array( $old_references[] = array(

1
plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
View File

@@ -331,6 +331,7 @@ class serendipity_event_entryproperties extends serendipity_event
?> ?>
<div class="entryproperties_access_pw form_field"> <div class="entryproperties_access_pw form_field">
<label for="properties_access_pw"><?php echo PASSWORD; ?>:</label> <label for="properties_access_pw"><?php echo PASSWORD; ?>:</label>
<input type="password" name="ignore_password" value="" style="display:none">
<input id="properties_access_pw" name="serendipity[properties][entrypassword]" type="password" autocomplete="off" value="<?php echo serendipity_specialchars($password); ?>"> <input id="properties_access_pw" name="serendipity[properties][entrypassword]" type="password" autocomplete="off" value="<?php echo serendipity_specialchars($password); ?>">
</div> </div>
<?php <?php

2
serendipity_config.inc.php
View File

@@ -302,7 +302,7 @@ if (serendipity_FUNCTIONS_LOADED !== true) {
if (!serendipity_db_connect()) { if (!serendipity_db_connect()) {
$serendipity['lang'] = 'en'; $serendipity['lang'] = 'en';
include(S9Y_INCLUDE_PATH . 'include/lang.inc.php'); include(S9Y_INCLUDE_PATH . 'include/lang.inc.php');
$serendipity['logger']->critical(DATABASE_ERROR); if (is_object($serendipity['logger'])) $serendipity['logger']->critical(DATABASE_ERROR);
serendipity_die(DATABASE_ERROR); serendipity_die(DATABASE_ERROR);
} }