Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24503
Modified Files:
serendipity_functions.inc.php serendipity_genpage.inc.php
Log Message:
Livesearch: The <script src=...> tag must be within the HEAD section,
otherwise mozilla makes trouble. So I renamed the pagebottom hook to
page_header (which is also better for future plugins).
Embedded blogs need to emit that library call on their own. I documented
that in both NEWS and our wiki-installation page.
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- serendipity_functions.inc.php 14 Jul 2004 10:21:05 -0000 1.330
+++ serendipity_functions.inc.php 14 Jul 2004 13:04:09 -0000 1.331
@@ -1158,8 +1158,8 @@
$html_extended = '';
$extended_css = 'serendipity_entry_body_folded';
if ($extended && strlen($entry['extended'])) {
- $html_extended = '<span class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
- $html_extended .= $entry['extended'] . '</span>';
+ $html_extended = '<div class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
+ $html_extended .= $entry['extended'] . '</div>';
$extended_css = 'serendipity_entry_body_unfolded';
}
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_genpage.inc.php 13 Jul 2004 14:15:18 -0000 1.30
+++ serendipity_genpage.inc.php 14 Jul 2004 13:04:09 -0000 1.31
@@ -27,11 +27,15 @@
if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) { ?>
<link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&entry_id=<?php echo $serendipity['GET']['id']; ?>" />
<?php } ?>
+<?php serendipity_plugin_api::hook_event('frontend_header', $serendipity); ?>
</head>
<body>
<?php
} // end if (is serendipity embedded?)
+ else {
+ serendipity_plugin_api::hook_event('frontend_header', $serendipity);
+}
include_once('serendipity_config.inc.php');
include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
@@ -43,8 +47,6 @@
include $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/layout.php';
}
-serendipity_plugin_api::hook_event('frontend_pagebottom', $serendipity);
-
if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
?>
</body>
|
