Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13852/include/admin
Modified Files:
entries.inc.php
Log Message:
- Fix language constants being named in reverse (IFRAME_SAVE vs. IFRAME_PREVIEW)
- Don't say we do trackbacks when saving a draft
- Don't use iframe when saving a draft
- Don't echo status messages within iframe function
Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- entries.inc.php 26 Dec 2004 18:34:34 -0000 1.16
+++ entries.inc.php 23 Jan 2005 01:08:23 -0000 1.17
@@ -299,10 +299,17 @@
// Save the entry, or just display a preview
if ($serendipity['POST']['preview'] != 'true') {
- if ($serendipity['use_iframe']) {
- serendipity_iframe_create('save', $entry);
+ /* We don't need an iframe to save a draft */
+ if ( $serendipity['POST']['isdraft'] == 'true' ) {
+ echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_SAVE_DRAFT . '</div><br />';
+ serendipity_updertEntry($entry);
} else {
- serendipity_iframe($entry, 'save');
+ if ($serendipity['use_iframe']) {
+ echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_SAVE . '</div><br />';
+ serendipity_iframe_create('save', $entry);
+ } else {
+ serendipity_iframe($entry, 'save');
+ }
}
} else {
// Only display the preview
@@ -336,6 +343,7 @@
}
if ($serendipity['use_iframe']) {
+ echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_PREVIEW . '</div><br />';
serendipity_iframe_create('preview', $entry);
} else {
serendipity_iframe($entry, 'preview');
|