Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19144
Modified Files:
Tag: branch-smarty
serendipity_functions.inc.php serendipity_genpage.inc.php
Log Message:
- Tweak $has_extended some more
- Rename $is_popup to $use_popups
- Use simpler Smarty logic
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.10
retrieving revision 1.419.2.11
diff -u -d -r1.419.2.10 -r1.419.2.11
--- serendipity_functions.inc.php 10 Sep 2004 21:59:36 -0000 1.419.2.10
+++ serendipity_functions.inc.php 10 Sep 2004 22:20:24 -0000 1.419.2.11
@@ -1127,7 +1127,7 @@
$entry['title'] = htmlspecialchars($entry['title']);
$entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
- if (!$extended && strlen($entry['extended'])) {
+ if (strlen($entry['extended'])) {
$entry['has_extended'] = true;
}
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.5
retrieving revision 1.33.2.6
diff -u -d -r1.33.2.5 -r1.33.2.6
--- serendipity_genpage.inc.php 10 Sep 2004 15:48:28 -0000 1.33.2.5
+++ serendipity_genpage.inc.php 10 Sep 2004 22:20:25 -0000 1.33.2.6
@@ -20,7 +20,7 @@
'CONST' => get_defined_constants(),
'is_xhtml' => $serendipity['XHTML11'],
- 'is_popup' => $serendipity['enablePopup'],
+ 'use_popups' => $serendipity['enablePopup'],
'is_embedded' => (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) ? false : true,
'is_raw_mode' => $serendipity['smarty_raw_mode'],
|
