cvs: pearweb /include/notes ManualNotes.class.php /templates/notes note.tpl.php

wiesemann Fri May 11 21:21:27 2007 UTC

Modified files:
/pearweb/include/notes ManualNotes.class.php
/pearweb/templates/notes note.tpl.php
Log:
- more fixes for bug #11016:
* remove useless "view origin" link (we're already there! *g*)
* fix time format (use UTC like in the bug tracker)

http://cvs.php.net/viewvc.cgi/pearwe...iff_format= u
Index: pearweb/include/notes/ManualNotes.class.php
diff -u pearweb/include/notes/ManualNotes.class.php:1.21 pearweb/include/notes/ManualNotes.class.php:1.22
--- pearweb/include/notes/ManualNotes.class.php:1.21 Mon Apr 30 02:43:32 2007
+++ pearweb/include/notes/ManualNotes.class.php Fri May 11 21:21:27 2007
@@ -397,9 +397,10 @@
$pretime = strptime($comment['note_time'], '%Y%m%d%H%M%S');
$mytime = mktime($pretime['tm_hour'], $pretime['tm_min'], $pretime['tm_sec'],
$pretime['tm_mon'] + 1, $pretime['tm_mday'], $pretime['tm_year'] + 1900);
- $time = date('d-M-Y H:i', $mytime);
+ $time = date('Y-m-d H:i', $mytime - date('Z', $mytime)) . ' UTC';
} else {
- $time = date('d-M-Y H:i', strtotime($comment['note_time']));
+ $date = strtotime($comment['note_time']);
+ $time = date('Y-m-d H:i', $date - date('Z', $date)) . ' UTC';
}
$noteId = (int)$comment['note_id'];
$userHandle = $comment['user_handle'] ?
http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/templates/notes/note.tpl.php
diff -u pearweb/templates/notes/note.tpl.php:1.3 pearweb/templates/notes/note.tpl.php:1.4
--- pearweb/templates/notes/note.tpl.php:1.3 Mon Apr 30 02:42:16 2007
+++ pearweb/templates/notes/note.tpl.php Fri May 11 21:21:27 2007
@@ -1,7 +1,6 @@
<?php if ($pending) { ?>

-<div class="pending_note">Pending note <a href="/notes/admin/?url=<?php echo $id ?>">Approve/Delete</a> &nbsp;
-(<a href="/manual/en/<?php echo $id ?>">view origin</a>)
+<div class="pending_note">Pending note <a href="/notes/admin/?url=<?php echo $id ?>">Approve/Delete</a>
<?php } else { ?>
<div class="note">
<?php } ?>