details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/91adc20a8211
changeset: 6406:91adc20a8211
user: Dirk Haun <dirk at haun-online.de>
date: Mon Sep 29 20:07:00 2008 +0200
description:
Merging changes
diffstat:
2 files changed, 2 insertions(+), 6 deletions(-)
readme | 4 +---
system/classes/story.class.php | 4 +---
diffs (28 lines):
diff -r 68d2bd44d549 -r 91adc20a8211 readme
--- a/readme Mon Sep 29 20:02:29 2008 +0200
+++ b/readme Mon Sep 29 20:07:00 2008 +0200
@@ -124,9 +124,7 @@
All known issues are tracked in our bug tracker. If you identify a bug please
let us know by filling out a bug report at:
-http://project.geeklog.net/tracker/?group_id=6&atid=105
-
-*** Currently down for maintenance for an undefined period of time, Tony! ***
+http://project.geeklog.net/tracking/
4) System Requirements and Installation
diff -r 68d2bd44d549 -r 91adc20a8211 system/classes/story.class.php
--- a/system/classes/story.class.php Mon Sep 29 20:02:29 2008 +0200
+++ b/system/classes/story.class.php Mon Sep 29 20:07:00 2008 +0200
@@ -1456,9 +1456,7 @@
if (empty($this->_expire)) {
$return = time();
} else {
- // Need to convert text date/time to a timestamp
- $return = explode(' ', $this->_expire);
- $return = COM_convertDate2Timestamp($return[0], $return[1]);
+ $return = $this->_expire;
}
break;