Changeset 3598

Timestamp:

07/05/07 01:05:54 (3 years ago)

Author:

inureyes

Message:

#375

• 글 작성시 미리보기가 안되는 문제 수정

Location:

trunk

Files:

• blog/owner/entry/preview/item.php (modified) (1 diff)
• lib/model/blog.entry.php (modified) (3 diffs)
• lib/model/blog.trackback.php (modified) (2 diffs)
• lib/piece/blog/begin.php (modified) (1 diff)

trunk/blog/owner/entry/preview/item.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 define('ROOT', '../../../..');
-require ROOT . '/lib/includeForBlogOwner.php';
+require ROOT . '/lib/includeForBlog.php';
+requireModel('blog.entry');
 $entries = array();
-if (!$entry = getEntry($owner, $suri['id'], true))
-    $entry = getEntry($owner, $suri['id'], false);
+if (!$entry = getEntry($blogid, $suri['id'], true))
+    $entry = getEntry($blogid, $suri['id'], false);
 if ($entry && ($entry['category'] >= 0)) {
     if (isset($entry['appointed']))
         $entry['published'] = $entry['appointed'];
-    $entry['categoryLabel'] = getCategoryLabelById($owner, $entry['category']);
+    $entry['categoryLabel'] = getCategoryLabelById($blogid, $entry['category']);
     $entries[0] = $entry;
 }

trunk/lib/model/blog.entry.php

@@ -23 +23 @@
 function getEntry($blogid, $id, $draft = false) {
     global $database;
+    requireModel('blog.attachment');
     if ($id == 0) {
         if ($draft) {
@@ -31 +32 @@
                 return;
             deleteAttachments($blogid, 0);
-            return array('id' => 0, 'userid' => 0, 'draft' => 0, 'visibility' => 0, 'category' => 0, 'location' => '', 'title' => '', 'content' => '', 'contentFormatter' => getDefaultFormatter(), 'contentEditor' => getDefaultEditor(), 'acceptComment' => 1, 'acceptTrackback' => 1, 'published' => time(), 'slogan' => '');
+            return array('id'    => 0, 
+                    'userid'     => 0, 
+                    'draft'      => 0, 
+                    'visibility' => 0, 
+                    'category'   => 0, 
+                    'location'   => '', 
+                    'title'      => '', 
+                    'content'    => '', 
+                    'contentFormatter' => getDefaultFormatter(), 
+                    'contentEditor'    => getDefaultEditor(), 
+                    'acceptComment'    => 1, 
+                    'acceptTrackback'  => 1, 
+                    'published'  => time(), 
+                    'slogan'     => '');
         }
     }
     if ($draft) {
-        $entry = DBQuery::queryRow("SELECT * FROM {$database['prefix']}Entries WHERE owner = $blogid AND id = $id AND draft = 1");
+        $entry = DBQuery::queryRow("SELECT * FROM {$database['prefix']}Entries 
+                WHERE owner = $blogid 
+                    AND id = $id 
+                    AND draft = 1");
         if (!$entry)
             return;
@@ -43 +60 @@
             $entry['appointed'] = $entry['published'];
         if ($id != 0)
-            $entry['published'] = DBQuery::queryCell("SELECT published FROM {$database['prefix']}Entries WHERE owner = $blogid AND id = $id AND draft = 0");
+            $entry['published'] = DBQuery::queryCell("SELECT published 
+                    FROM {$database['prefix']}Entries 
+                    WHERE owner = $blogid AND id = $id AND draft = 0");
         return $entry;
     } else {
         $visibility = doesHaveOwnership() ? '' : 'AND visibility > 0';
-        $entry = DBQuery::queryRow("SELECT * FROM {$database['prefix']}Entries WHERE owner = $blogid AND id = $id AND draft = 0 $visibility");
+        $entry = DBQuery::queryRow("SELECT * 
+                FROM {$database['prefix']}Entries 
+                WHERE owner = $blogid AND id = $id AND draft = 0 $visibility");
         if (!$entry)
             return;

trunk/lib/model/blog.trackback.php

@@ -10 +10 @@
     
     $postfix = '';
-    $sql = "SELECT t.*, c.name categoryName FROM {$database['prefix']}Trackbacks t LEFT JOIN {$database['prefix']}Entries e ON t.owner = e.owner AND t.entry = e.id AND e.draft = 0 LEFT JOIN {$database['prefix']}Categories c ON t.owner = c.owner AND e.category = c.id WHERE t.owner = $blogid AND t.isFiltered = 0";
+    $sql = "SELECT t.*, c.name categoryName 
+        FROM {$database['prefix']}Trackbacks t 
+        LEFT JOIN {$database['prefix']}Entries e ON t.owner = e.owner AND t.entry = e.id AND e.draft = 0 
+        LEFT JOIN {$database['prefix']}Categories c ON t.owner = c.owner AND e.category = c.id 
+        WHERE t.owner = $blogid AND t.isFiltered = 0";
     if ($category > 0) {
         $categories = DBQuery::queryColumn("SELECT id FROM {$database['prefix']}Categories WHERE owner = $blogid AND parent = $category");
@@ -42 +46 @@
     global $database;
     $trackbacks = array();
-    $result = DBQuery::query("select * from {$database['prefix']}Trackbacks where owner = ".getBlogId()." AND entry = $entry AND isFiltered = 0 order by written");
+    $result = DBQuery::query("select * 
+            from {$database['prefix']}Trackbacks 
+            where owner = ".getBlogId()." 
+                AND entry = $entry 
+                AND isFiltered = 0 
+            order by written");
     while ($trackback = mysql_fetch_array($result))
         array_push($trackbacks, $trackback);

trunk/lib/piece/blog/begin.php

@@ -5 +5 @@
 
 $blogid = getBlogId();
+requireModel('blog.statistics');
 
 updateVisitorStatistics($blogid);