Changeset 616

Timestamp:

Jun 8, 2010, 9:37:06 AM (14 years ago)

Author:

toemon

Message:

D3Forumコメント統合一括インポート・エクスポート時の時間ずれバグ修正 Fixes#350 (thx bichico)

Location:

trunk/xpressme_integration_kit

Files:

• class/xpressD3commentContent.class.php (modified) (2 diffs)
• wp-content/plugins/xpressme/include/d3forum_comment_synchro.php (modified) (3 diffs)

trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php

@@ -45 +45 @@
                 {
                         global $xoops_config;
+                        if ( function_exists('date_default_timezone_set') )
+                                date_default_timezone_set($xoops_config->xoops_time_zone);
                         $new_params = $this->restructParams( $params ) ;
                         if (!$this->canAddComment($params['id']) ) {
@@ -57 +59 @@
                                 echo $d3comment;
                         } else {
-                                if ( function_exists('date_default_timezone_set') )
-                                date_default_timezone_set($xoops_config->xoops_time_zone);
                                 d3forum_render_comments( $this->d3forum_dirname , $new_params['forum_id'] , $new_params , $this->smarty ) ;
-                                if ( function_exists('date_default_timezone_set') )
-                                        date_default_timezone_set('UTC');
-                        }
+                        }
+                        if ( function_exists('date_default_timezone_set') )
+                                date_default_timezone_set('UTC');
                 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/d3forum_comment_synchro.php

@@ -459 +459 @@
         }
         $comment_author_IP = "'" . $d3f_row->poster_ip . "'";
-        $comment_date = "'" . date('Y-m-d H:i:s' , $d3f_row->post_time) . "'";
+        $gmt_offset = get_option('gmt_offset');
+        $local_timestamp = $d3f_row->post_time + ($gmt_offset * 3600);
+        $comment_date = "'" . date('Y-m-d H:i:s' , $local_timestamp) . "'";
         $comment_content = "'" . addSlashes($d3f_row->post_text) . "'";
         $comment_approved = "'" . $d3f_row->approval . "'";
@@ -543 +545 @@
 
         $sql  = "SELECT $wp_comments.comment_ID,$wp_comments.comment_post_ID, ";
-        $sql .=         "$wp_comments.comment_author, $wp_comments.comment_author_email,  $wp_comments.comment_date, ";
+        $sql .=         "$wp_comments.comment_author, $wp_comments.comment_author_email,  $wp_comments.comment_date, $wp_comments.comment_date_gmt, ";
         $sql .=         "$wp_comments.comment_author_url, $wp_comments.comment_author_IP, ";
         $sql .=         "$wp_comments.comment_content, $wp_comments.comment_karma, ";
@@ -561 +563 @@
         $topic_external_link_id = $row->comment_post_ID; //There is information on WP post_ID in topic_external_link_id of D3Forum
         $topic_title = 'Re.' . addSlashes($row->post_title);
-        $post_time = strtotime($row->comment_date);             // or   $row2['comment_date_gmt']
-        $modified_time = strtotime($row->comment_date); // or   $row2['comment_date_gmt']
+        $post_time = strtotime($row->comment_date_gmt); 
+        $modified_time = strtotime($row->comment_date_gmt);
         require_once (get_xpress_dir_path() . 'include/general_functions.php');
         if (empty($row->user_id)){