Changeset 2477

Timestamp:

06/02/08 04:23:05 (17 months ago)

Author:

takayama

Message:

Fixed BugId:79930
* If archive type is not Page, archiveurl is respected.

Files:

• branches/release-39/php/lib/mtdb_base.php (modified) (9 diffs)

branches/release-39/php/lib/mtdb_base.php

@@ -232 +232 @@
             }
             $blog =& $this->fetch_blog($link['fileinfo_blog_id']);
-            $blog_url = $blog['blog_site_url'];
+            $blog_url = $blog['blog_archive_url'];
+            $blog_url or $blog_url = $blog['blog_site_url'];
             $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
             $url = $blog_url . $link['fileinfo_url'];
@@ -262 +263 @@
             }
             $blog =& $this->fetch_blog($blog_id);
-            $blog_url = $blog['blog_site_url'];
+            if ($at == 'Page') {
+                $blog_url = $blog['blog_site_url'];
+            } else {
+                $blog_url = $blog['blog_archive_url'];
+                $blog_url or $blog_url = $blog['blog_site_url'];
+            }
             $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
             $url = $blog_url . $link['fileinfo_url'];
@@ -321 +327 @@
             }
             $blog =& $this->fetch_blog($link['fileinfo_blog_id']);
-            $blog_url = $blog['blog_site_url'];
+            if ($at == 'Page') {
+                $blog_url = $blog['blog_site_url'];
+            } else {
+                $blog_url = $blog['blog_archive_url'];
+                $blog_url or $blog_url = $blog['blog_site_url'];
+            }
             $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
             $url = $blog_url . $link['fileinfo_url'];
@@ -1821 +1832 @@
         $id_list = substr($id_list, 1);
         $query = "
-            select fileinfo_entry_id, fileinfo_url, blog_site_url, blog_file_extension
+            select fileinfo_entry_id, fileinfo_url, blog_site_url, blog_file_extension, blog_archive_url
               from mt_fileinfo, mt_templatemap, mt_blog
              where fileinfo_entry_id in ($id_list)
@@ -1833 +1844 @@
 
             foreach ($results as $row) {
-                $blog_url = $row[2];
+                $blog_url = $row[4];
+                $blog_url or $blog_url = $row[2];
                 $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
                 $url = $blog_url . $row[1];
@@ -1854 +1866 @@
         $id_list = substr($id_list, 1);
         $query = "
-            select fileinfo_category_id, fileinfo_url, blog_site_url, blog_file_extension
+            select fileinfo_category_id, fileinfo_url, blog_site_url, blog_file_extension, blog_archive_url
               from mt_fileinfo, mt_templatemap, mt_blog
              where fileinfo_category_id in ($id_list)
@@ -1865 +1877 @@
         if ($results) {
             foreach ($results as $row) {
-                $blog_url = $row[2];
+                $blog_url = $row[4];
+                $blog_url or $blog_url = $row[2];
                 $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
                 $url = $blog_url . $row[1];
@@ -2528 +2541 @@
             $range = "'$low' and '$hi'";
             $link_cache_sql = "
-                select fileinfo_startdate, fileinfo_url, blog_site_url, blog_file_extension
+                select fileinfo_startdate, fileinfo_url, blog_site_url, blog_file_extension, blog_archive_url
                   from mt_fileinfo, mt_templatemap, mt_blog
                  where fileinfo_startdate between $range
@@ -2541 +2554 @@
                 foreach ($cache_results as $row) {
                     $date = $this->db2ts($row[0]);
-                    $blog_url = $row[2];
+                    if ($at == 'Page') {
+                        $blog_url = $row[2];
+                    } else {
+                        $blog_url = $row[4];
+                        $blog_url or $blog_url = $row[2];
+                    }
                     $blog_url = preg_replace('!(https?://(?:[^/]+))/.*!', '$1', $blog_url);
                     $url = $blog_url . $row[1];