Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18413
Modified Files:
Tag: branch-smarty
serendipity_config.inc.php serendipity_functions.inc.php
serendipity_genpage.inc.php
Log Message:
* Fix broken layout.php compatibility mode
* Fix broken templateselector event hooks
Tom, the way I inserted those display() parts and the order of the plugin hooks indeed makes sense :-)
(Try to put the original layout.php into the default template directory)
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.6
retrieving revision 1.419.2.7
diff -u -d -r1.419.2.6 -r1.419.2.7
--- serendipity_functions.inc.php 9 Sep 2004 21:10:48 -0000 1.419.2.6
+++ serendipity_functions.inc.php 10 Sep 2004 09:16:32 -0000 1.419.2.7
@@ -239,7 +239,6 @@
if ($serendipity['smarty_raw_mode']) {
$serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath'));
}
- serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
}
function serendipity_setCookie($name,$value) {
@@ -1267,7 +1266,12 @@
)
);
- serendipity_smarty_fetch('ENTRIES', 'entries.tpl');
+ if ($serendipity['smarty_raw_mode']) {
+ serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl');
+ serendipity_smarty_fetch('COMMENTS', 'comments.tpl');
+ serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
+ $serendipity['smarty']->display(serendipity_getTemplateFile('entries.tpl', 'serendipityPath'));
+ }
} // end function serendipity_printEntries
function serendipity_deleteComment($id, $entry_id, $type='comments')
@@ -1515,15 +1519,13 @@
{
global $serendipity;
- $serendipity['smarty']->assign('is_trackbacks_owner', ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment[0]['authorid'])) ? true : false);
+ $serendipity['smarty']->assign('is_trackbacks_owner', ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || isset($comment[0]) && $_SESSION['serendipityAuthorid'] == $comment[0]['authorid'])) ? true : false);
$serendipity['smarty']->assign('trackbacks', $comments);
$serendipity['smarty']->assign('trackbacks_count', sizeof($comments));
-
+
if ($serendipity['smarty_raw_mode']) {
$serendipity['smarty']->display(serendipity_getTemplateFile('trackbacks.tpl', 'serendipityPath'));
}
-
- serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl');
}
function serendipity_approveComment($cid, $entry_id, $force = false) {
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -u -d -r1.33.2.3 -r1.33.2.4
--- serendipity_genpage.inc.php 9 Sep 2004 19:23:58 -0000 1.33.2.3
+++ serendipity_genpage.inc.php 10 Sep 2004 09:16:33 -0000 1.33.2.4
@@ -49,6 +49,10 @@
// Use new Smarty driven templating
// Watchout: Included files from within the templates need to be fetched in reverse order!
include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath'));
+ serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl');
+ serendipity_smarty_fetch('COMMENTS', 'comments.tpl');
+ serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
+ serendipity_smarty_fetch('ENTRIES', 'entries.tpl');
serendipity_smarty_fetch('CONTENT', 'content.tpl');
}
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.2
retrieving revision 1.93.2.3
diff -u -d -r1.93.2.2 -r1.93.2.3
--- serendipity_config.inc.php 9 Sep 2004 16:41:31 -0000 1.93.2.2
+++ serendipity_config.inc.php 10 Sep 2004 09:16:32 -0000 1.93.2.3
@@ -222,13 +222,14 @@
. 'X-Engine: PHP/'. phpversion();
+serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
define('SMARTY_DIR', $serendipity['serendipityPath'] . 'bundled-libs/Smarty/libs/');
require_once SMARTY_DIR . 'Smarty.class.php';
$serendipity['smarty'] = new Smarty;
if ( !$serendipity['production'] ) {
$serendipity['smarty']->force_compile = true;
$serendipity['smarty']->debugging = true;
-}
+}
$serendipity['smarty']->template_dir = dirname(serendipity_getTemplateFile('index.tpl', 'serendipityPath'));
$serendipity['smarty']->compile_dir = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;
$serendipity['smarty']->config_dir = &$serendipity['smarty']->template_dir;
@@ -236,7 +237,7 @@
$serendipity['smarty']->security = true;
$serendipity['smarty']->use_sub_dirs = false;
$serendipity['smarty']->compile_check = true;
-$serendipity['smarty']->compile_id = &$serendipity['template'];
+$serendipity['smarty']->compile_id = &$serendipity['template'];
$serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename');
$serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target');
@@ -244,7 +245,5 @@
$serendipity['smarty']->register_modifier('printf', 'serendipity_printf');
$serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime');
-serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
-
/* vim: set sts=4 ts=4 expandtab : */
?>
|
