first fix for entrycheck discarding drafts (#162)
This commit is contained in:
parent
ad8606c782
commit
479efe7e7d
@ -85,7 +85,10 @@ switch($serendipity['GET']['adminAction']) {
|
||||
/* We don't need an iframe to save a draft */
|
||||
if ( $serendipity['POST']['isdraft'] == 'true' ) {
|
||||
$data['is_draft'] = true;
|
||||
serendipity_updertEntry($entry);
|
||||
$errors = serendipity_updertEntry($entry);
|
||||
if (is_numeric($errors)) {
|
||||
$errors = "";
|
||||
}
|
||||
} else {
|
||||
if ($serendipity['use_iframe']) {
|
||||
$data['is_iframe'] = true;
|
||||
@ -170,7 +173,8 @@ switch($serendipity['GET']['adminAction']) {
|
||||
'serendipity[adminAction]' => 'save',
|
||||
'serendipity[timestamp]' => htmlspecialchars($entry['timestamp'])
|
||||
),
|
||||
$entry
|
||||
$entry,
|
||||
$errors
|
||||
);
|
||||
}
|
||||
|
||||
@ -398,6 +402,7 @@ switch($serendipity['GET']['adminAction']) {
|
||||
}
|
||||
|
||||
$data['entryForm'] = $entryForm;
|
||||
$data['errors'] = $errors;
|
||||
$data['get'] = $serendipity['GET']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime
|
||||
// make sure we've got these
|
||||
if(!isset($data['urltoken'])) $data['urltoken'] = serendipity_setFormToken('url');
|
||||
|
@ -211,7 +211,7 @@
|
||||
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.DATE_INVALID}</span>
|
||||
{/if}
|
||||
{if ($get.adminAction && $use_legacy)}
|
||||
{if $is_draft}
|
||||
{if $is_draft && ! $errors}
|
||||
<span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.IFRAME_SAVE_DRAFT}</span>
|
||||
{/if}
|
||||
{if $is_iframe}
|
||||
|
Loading…
x
Reference in New Issue
Block a user