Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25589
Modified Files:
Tag: branch-smarty
NEWS serendipity_sidebar_items.php
Log Message:
fix calendar pagination
Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -d -r1.84 -r1.84.2.1
--- serendipity_sidebar_items.php 25 Aug 2004 21:50:05 -0000 1.84
+++ serendipity_sidebar_items.php 15 Sep 2004 15:17:09 -0000 1.84.2.1
@@ -18,7 +18,7 @@
}
$propbag->add('type', 'select');
- $propbag->add('select_values', $options);
+ $propbag->add('select_values', $options);
$propbag->add('name', CALENDAR_BEGINNING_OF_WEEK);
$propbag->add('description', CALENDAR_BOW_DESC);
$propbag->add('default', 1);
@@ -38,20 +38,22 @@
if (!isset($serendipity['GET']['calendarZoom'])) {
if (!isset($serendipity['GET']['range'])) {
- $serendipity['GET']['calendarZoom'] = date('Y') . date('m');
+ $calendarZoom = date('Y') . date('m');
} else {
- $serendipity['GET']['calendarZoom'] = $serendipity['GET']['range'];
+ $calendarZoom = $serendipity['GET']['range'];
}
+ } else {
+ $calendarZoom = $serendipity['GET']['calendarZoom'];
}
serendipity_drawCalendar(
substr(
- (isset($serendipity['GET']['calendarZoom']) ? $serendipity['GET']['calendarZoom'] : ''),
+ $calendarZoom,
4,
2
),
substr(
- (isset($serendipity['GET']['calendarZoom']) ? $serendipity['GET']['calendarZoom'] : ''),
+ $calendarZoom,
0,
4
),
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.6
retrieving revision 1.214.2.7
diff -u -d -r1.214.2.6 -r1.214.2.7
--- NEWS 15 Sep 2004 11:20:42 -0000 1.214.2.6
+++ NEWS 15 Sep 2004 15:17:08 -0000 1.214.2.7
@@ -11,6 +11,9 @@
Version 0.7 ()
------------------------------------------------------------------------
+ * Fixed entries pagination for special cases where quickump calendar
+ was displayed on the left sidebar (garvinhicking)
+
* Added Italian translations, thanks to Alessandro Pellizzari
* Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock)
|
