From 414fd39f7ea80a5595dc7b0e483c7e8f08e6b448 Mon Sep 17 00:00:00 2001
From: "mike.morgan%oregonstate.edu"
 <mike.morgan%oregonstate.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Oct 2006 20:20:09 +0000
Subject: [PATCH] Update from Ryan.  Fixes wacky times in the comments and a JS
 error.

git-svn-id: svn://10.0.0.236/trunk@213511 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/partytool/controllers/comments_controller.php | 2 +-
 mozilla/webtools/partytool/views/parties/view.thtml            | 2 +-
 mozilla/webtools/partytool/webroot/js/maps.js                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/partytool/controllers/comments_controller.php b/mozilla/webtools/partytool/controllers/comments_controller.php
index fc306abc4e9..3f2b2bcd902 100644
--- a/mozilla/webtools/partytool/controllers/comments_controller.php
+++ b/mozilla/webtools/partytool/controllers/comments_controller.php
@@ -57,7 +57,7 @@ class CommentsController extends AppController {
       $this->data['Comment']['text'] = nl2br($text);
       $this->data['Comment']['owner'] = $uid;
       $this->data['Comment']['assoc'] = $pid;
-      $this->data['Comment']['time'] = gmmktime();
+      $this->data['Comment']['time'] = mktime();
 
       if ($this->Comment->save($this->data)) {
         $this->redirect('/parties/view/'.$pid.'#c'.$this->Comment->getLastInsertID());
diff --git a/mozilla/webtools/partytool/views/parties/view.thtml b/mozilla/webtools/partytool/views/parties/view.thtml
index 1719be39388..b0311e434a6 100755
--- a/mozilla/webtools/partytool/views/parties/view.thtml
+++ b/mozilla/webtools/partytool/views/parties/view.thtml
@@ -81,7 +81,7 @@
       <div id="c<?php echo $comment['comments']['cid'];?>" class="comment <?php echo $class;?>">
         <span class="comment-content"><?php echo $comment['comments']['text']; ?></span>
         <span class="comment-tag"><br/><br/>Posted by <a href="<?php echo $html->url('/users/view/'.$comment['users']['uid']); ?>">
-        <?php echo $comment['users']['name']; ?></a> on <?php echo date('Y-m-d h:ia', $comment['comments']['time'] - (@$_SESSION['User']['tz'] * 60 * 60)); ?></span>
+        <?php echo $comment['users']['name']; ?></a> on <?php echo gmdate('Y-m-d h:ia', $comment['comments']['time'] + (@$_SESSION['User']['tz'] * 60 * 60)); ?></span>
         </span>
       </div>
     <?php endforeach; 
diff --git a/mozilla/webtools/partytool/webroot/js/maps.js b/mozilla/webtools/partytool/webroot/js/maps.js
index e4975929c36..36f8727f5e3 100755
--- a/mozilla/webtools/partytool/webroot/js/maps.js
+++ b/mozilla/webtools/partytool/webroot/js/maps.js
@@ -30,7 +30,6 @@ function mapInit(aLat, aLng, aZoom, aState) {
 
 function geocode(aLoc) {
     var gcoder = new GClientGeocoder();
-    document.getElementById('geocoded').value = 1;
     gcoder.getLatLng(aLoc, function (point) {
       if (!point) {
         suggest(aLoc);