Changeset 5616

Timestamp:

03/21/08 22:41:18 (8 months ago)

Author:

inureyes

Message:

#193

• [5614] 반영
  
• peris님 오랜만입니다 >_<
  

Files:

• trunk/lib/model/reader.common.php (modified) (8 diffs)

trunk/lib/model/reader.common.php

@@ -141 +141 @@
                 ON
                     f.id = i.feed
-                LEFT JOIN                   
+                LEFT JOIN
                     {$database['prefix']}FeedStarred s
                 ON
                     s.blogid = $blogid AND
                     i.id = s.item
-                LEFT JOIN                   
+                LEFT JOIN
                     {$database['prefix']}FeedReads rd
                 ON
@@ -180 +180 @@
                     {$database['prefix']}Feeds f,
                     {$database['prefix']}FeedItems i
-                LEFT JOIN                   
+                LEFT JOIN
                     {$database['prefix']}FeedStarred s
                 ON
                     s.blogid = $blogid AND
                     i.id = s.item
-                LEFT JOIN                   
+                LEFT JOIN
                     {$database['prefix']}FeedReads rd
                 ON
@@ -225 +225 @@
                         {$database['prefix']}Feeds f,
                         {$database['prefix']}FeedItems i
-                    LEFT JOIN                   
+                    LEFT JOIN
                         {$database['prefix']}FeedStarred s
                     ON
                         s.blogid = $blogid AND
                         i.id = s.item
-                    LEFT JOIN                   
+                    LEFT JOIN
                         {$database['prefix']}FeedReads rd
                     ON
@@ -407 +407 @@
                     else if(isset($rssInfo['path'])) {
                         if($rssInfo['path']{0} == '/')
-                            $rssURL = "{$urlInfo['scheme']}://{$urlInfo['host']}{$rssInfo['path']}";                            
+                            $rssURL = "{$urlInfo['scheme']}://{$urlInfo['host']}{$rssInfo['path']}";
                         else
                             $rssURL = "{$urlInfo['scheme']}://{$urlInfo['host']}".(isset($urlInfo['path']) ? rtrim($urlInfo['path'], '/') : '').'/'.$rssInfo['path'];
@@ -429 +429 @@
             $feed['language'] = 'en-US';
         $feed['modified'] = gmmktime();
-    } else if ($xmls->getAttribute('/feed', 'version')) {
+    } else if ($xmls->doesExist('/feed')) {
         $feed['blogURL'] = $xmls->getAttribute('/feed/link', 'href');
         $feed['title'] = $xmls->getValue('/feed/title');
@@ -462 +462 @@
     $feed['description'] = POD::escapeString(UTF8::lessenAsEncoding(UTF8::correct(stripHTML($feed['description']))));
     $feed['language'] = POD::escapeString(UTF8::lessenAsEncoding(UTF8::correct($feed['language']), 255));
-    
+
     return array(0, $feed, $xml);
 }
@@ -498 +498 @@
             saveFeedItem($feedId, $item);
         }
-    } else if ($xmls->getAttribute('/feed', 'version')) {
+    } else if ($xmls->doesExist('/feed')) {
         for ($i = 0; $link = $xmls->getValue("/feed/entry[$i]/id"); $i++) {
             for ($j = 0; $rel = $xmls->getAttribute("/feed/entry[$i]/link[$j]", 'rel'); $j++) {
@@ -575 +575 @@
         */
     } else if($id != null) {
-        return false;   
+        return false;
     } else {
         if ($item['written'] == 0) $item['written'] = gmmktime();