Changeset 7648 for trunk

Timestamp:

06/21/09 09:02:57 (9 months ago)

Author:

graphittie

Message:

refs #1283

• [7643] revert.
• RSS의 포스트 타이틀에 추가한 ViewPostTitle은 남겨놓았습니다.

Location:

trunk/library

Files:

• model/blog.feed.php (modified) (2 diffs)
• model/blog.response.remote.php (modified) (1 diff)
• model/common.plugin.php (modified) (1 diff)
• view/view.php (modified) (2 diffs)

trunk/library/model/blog.feed.php

@@ -102 +102 @@
         $entryURL = $defaultURL . '/' . ($blog['useSloganOnPost'] ? 'entry/' . rawurlencode($row['slogan']) : $row['id']);
 
-        $content = getEntryContentView($row['blogid'], $row['id'], $row['content'], $row['contentFormatter'], true, 'Post', true, 'rss');
+        $content = getEntryContentView($row['blogid'], $row['id'], $row['content'], $row['contentFormatter'], true, 'Post', true, true);
         $content = preg_replace('/<a href=("|\')(#[^\1]+)\1/i', '<a href=$1' . htmlspecialchars($entryURL) . '$2$1', $content);
         if (!$blog['publishWholeOnRSS']) {
@@ -110 +110 @@
         $item = array(
             'id' => $row['id'], 
-            'title' => RSSMessage(fireEvent('ViewPostTitle', $row['title'], $row['id'], 'rss')), 
+            'title' => RSSMessage(fireEvent('ViewPostTitle', $row['title'], $row['id'])), 
             'link' => $entryURL, 
             'categories' => array(), 'description' => RSSMessage($content), 

trunk/library/model/blog.response.remote.php

@@ -339 +339 @@
         return false;
     $link = "$defaultURL/$entryId";
-    $title = fireEvent('ViewPostTitle', $entry['title'], $entry['id'], 'trackback');
-    $entry['content'] = getEntryContentView($blogid, $entryId, $entry['content'], $entry['contentFormatter'], getKeywordNames($blogid), 'Post', false, 'trackback');
+    $title = fireEvent('ViewPostTitle', $entry['title'], $entry['id']);
+    $entry['content'] = getEntryContentView($blogid, $entryId, $entry['content'], $entry['contentFormatter'], getKeywordNames($blogid));
     $excerpt = str_tag_on(UTF8::lessen(removeAllTags(stripHTML($entry['content'])), 255));
     $blogTitle = $blog['title'];

trunk/library/model/common.plugin.php

@@ -310 +310 @@
             $pluginURL = "{$service['path']}/plugins/{$mapping['plugin']}";
             $pluginPath = ROOT . "/plugins/{$mapping['plugin']}";
-            if ($condition === true)
-                $target = call_user_func($mapping['listener'], $target, $mother);
-            else
-                $target = call_user_func($mapping['listener'], $target, $mother, $condition);
+            $target = call_user_func($mapping['listener'], $target, $mother);
         }
     }

trunk/library/view/view.php

@@ -1141 +1141 @@
 }
 
-function getEntryContentView($blogid, $id, $content, $formatter, $keywords = array(), $type = 'Post', $useAbsolutePath = false, $commonMode = true) {
+function getEntryContentView($blogid, $id, $content, $formatter, $keywords = array(), $type = 'Post', $useAbsolutePath = false, $bRssMode = false) {
     global $hostURL, $service;
     requireModel('blog.attachment');
     requireModel('blog.keyword');
     $content = fireEvent('Format' . $type . 'Content', $content, $id);
-    $func = ($commonMode !== true ? 'summarizeContent' : 'formatContent');
+    $func = ($bRssMode ? 'summarizeContent' : 'formatContent');
     $view = $func($blogid, $id, $content, $formatter, $keywords, $useAbsolutePath);
     if (defined('__TEXTCUBE_MOBILE__'))
@@ -1154 +1154 @@
 
     if (!empty($keywords) && is_array($keywords)) $view = bindKeywords($keywords, $view);
-    $view = fireEvent('View' . $type . 'Content', $view, $id, $commonMode);
+    $view = fireEvent('View' . $type . 'Content', $view, $id);
     
     // image resampling