Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10712 Modified Files: serendipity_admin_entries.inc.php serendipity_entries.php serendipity_functions.inc.php serendipity_rss_exchange.inc.php serendipity_xmlrpc.php Log Message: - Revert Jannis' popup patch Index: serendipity_xmlrpc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- serendipity_xmlrpc.php 18 Oct 2004 18:22:07 -0000 1.18 +++ serendipity_xmlrpc.php 20 Oct 2004 16:27:23 -0000 1.19 @@ -212,7 +212,7 @@ $entry['body'] = $val->getval(); $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; - $id = serendipity_updertEntry($entry, $foo); + $id = serendipity_updertEntry($entry); return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } @@ -229,7 +229,7 @@ $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; - $id = serendipity_updertEntry($entry, $foo); + $id = serendipity_updertEntry($entry); return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } @@ -296,7 +296,7 @@ $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; - $id = serendipity_updertEntry($entry, $foo); + $id = serendipity_updertEntry($entry); return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } @@ -318,7 +318,7 @@ $entry['isdraft'] = 'false'; $entry['id'] = $postid; - $id = serendipity_updertEntry($entry, $foo); + $id = serendipity_updertEntry($entry); return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } @@ -350,7 +350,7 @@ $entry['authorid'] = $serendipity['authorid']; $entry['id'] = $postid; - $id = serendipity_updertEntry($entry, $foo); + $id = serendipity_updertEntry($entry); return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } Index: serendipity_entries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- serendipity_entries.php 18 Oct 2004 18:22:06 -0000 1.42 +++ serendipity_entries.php 20 Oct 2004 16:27:23 -0000 1.43 @@ -35,21 +35,19 @@ </head> <body class="s9y_wrap" id="serendipity_admin_entries_page" onload="if (self.Spawnextended) { Spawnextended(); } if (self.Spawnbody) { Spawnbody(); }"> -<?php if (!$serendipity['GET']['noHeader']) { ?> <div id="serendipity_banner"> <h1><?php echo $serendipity['blogTitle'] ; ?></h1> - <h2><?php echo SERENDIPITY_AUTHORING_SUITE . ((serendipity_userLoggedIn()) ? ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')' : ''); ?></h2> + <h2><?php echo SERENDIPITY_AUTHORING_SUITE . ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')'; ?></h2> </div> + <table id="mainpane"> <tr valign="top"> -<?php } ?> <?php if ( !serendipity_userLoggedIn() ) { serendipity_printLogin(); } else { ?> -<?php if (!$serendipity['GET']['noHeader']) { ?> - <td id="serendipityLeftSideBar"> + <td id="serendipityLeftSideBar"> <div class="serendipitySideBarItem"> <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?>:</div> <div class="serendipitySideBarContent"> @@ -89,9 +87,9 @@ </div> </div> </td> + <td id="content"> <div class="serendipity_Admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div> -<?php } ?> <div class="serendipity_Admin"> <?php if (!isset($serendipity['GET']['adminModule'])) { @@ -130,12 +128,10 @@ </div> <?php } -if (!$serendipity['GET']['noHeader']) { ?> </td> </tr> </table> -<?php } ?> </body> </html> <?php Index: serendipity_admin_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- serendipity_admin_entries.inc.php 18 Oct 2004 18:22:06 -0000 1.38 +++ serendipity_admin_entries.inc.php 20 Oct 2004 16:27:23 -0000 1.39 @@ -283,7 +283,7 @@ // Save the entry, or just display a preview if ($serendipity['POST']['preview'] != 'true') { - $res = serendipity_updertEntry($entry, $backendPublish); + $res = serendipity_updertEntry($entry); if (is_string($res)) { serendipity_printEntryForm( '?', @@ -295,13 +295,7 @@ $entry, ERROR . ': <b>' . $res . '</b>'); } else { - echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '<br />' .PERFORMING_XMLRPC_PLEASE_WAIT. '</div>'; - echo '<iframe style="border:0;" src="?serendipity[noHeader]=true&serendipity[adminModule]=entries&serendipity[adminAction]=handleReferences&serendipity[id]='.$res. - '&serendipity[backendPublish]='.$backendPublish; - foreach($serendipity['POST']['announce_entries'] as $k => $v) { - echo '&serendipity[announce_entries]['.$k.']='.$v; - } - echo '" height="500" width="700" name="s9yTrackbackWindow" />'; + echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>'; } } else { // Only display the preview @@ -336,17 +330,6 @@ } break; - case 'handleReferences': - ignore_user_abort(true); - $entry = serendipity_fetchEntry('id', $serendipity[GET]['id']); - flush(); - serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry); - if ($serendipity['GET']['backendPublish']=='true') { - serendipity_plugin_api::hook_event('backend_publish', $entry); - } - echo '<br />'.PERFORMING_XMLRPC_DONE; - break; - case 'editSelect': serendipity_drawList(); break; Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.448 retrieving revision 1.449 diff -u -d -r1.448 -r1.449 --- serendipity_functions.inc.php 19 Oct 2004 20:29:45 -0000 1.448 +++ serendipity_functions.inc.php 20 Oct 2004 16:27:23 -0000 1.449 @@ -2588,7 +2588,7 @@ /** * Inserts a new entry into the database or updates an existing **/ -function serendipity_updertEntry($entry, &$backendPublish) { +function serendipity_updertEntry($entry) { global $serendipity; $categories = $entry['categories']; @@ -2688,15 +2688,17 @@ if ($entry['isdraft'] == 'false') { serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true)); - + serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry); } serendipity_purgeEntry($entry['id'], $entry['timestamp']); // Send publish tags if either a new article has been inserted from scratch, or if the entry was previously // stored as draft and is now published - $backendPublish = ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) ? 'true' : 'false'; - + if ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) { + serendipity_plugin_api::hook_event('backend_publish', $entry); + } + return (int)$entry['id']; } Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- serendipity_rss_exchange.inc.php 18 Oct 2004 18:22:07 -0000 1.12 +++ serendipity_rss_exchange.inc.php 20 Oct 2004 16:27:23 -0000 1.13 @@ -74,7 +74,7 @@ $serendipity['noautodiscovery'] = 1; while ($item = $c->getNextItem()) { if (serendipity_rss_buildEntry($item, $entry)) { - serendipity_updertEntry($entry, $foo); + serendipity_updertEntry($entry); } } |
