Changeset 4683
- Timestamp:
- 11/13/07 00:36:48 (12 months ago)
- Location:
- trunk
- Files:
-
- 4 modified
-
blog/checkup/index.php (modified) (1 diff)
-
lib/model/blog.keyword.php (modified) (5 diffs)
-
lib/model/blog.link.php (modified) (2 diffs)
-
setup.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/blog/checkup/index.php
r4678 r4683 951 951 } 952 952 953 / / Common parts.953 /***** Common parts. *****/ 954 954 if(doesHaveOwnership() && $blogids = DBQuery::queryColumn("SELECT blogid FROM {$database['prefix']}PageCacheLog")) { 955 955 $changed = true; -
trunk/lib/model/blog.keyword.php
r4563 r4683 8 8 $name = tc_escape_string($name); 9 9 $visibility = doesHaveOwnership() ? '' : 'AND visibility > 0'; 10 if ($result = DBQuery::query ("SELECT * FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -1 AND title = '$name'"))11 return mysql_fetch_array($result);10 if ($result = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -1 AND title = '$name'")) 11 return $result; 12 12 return false; 13 13 } … … 23 23 $names = array(); 24 24 $visibility = doesHaveOwnership() ? '' : 'AND visibility > 0'; 25 $result = DBQuery::query("SELECT title FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -1 ORDER BY char_length(title) DESC"); 26 while (list($name) = mysql_fetch_array($result)) 27 array_push($names, $name); 25 $names = DBQuery::queryColumn("SELECT title FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -1 ORDER BY char_length(title) DESC"); 28 26 return $names; 29 27 } … … 32 30 global $database; 33 31 $visibility = doesHaveOwnership() ? '' : 'AND visibility > 0'; 34 return DBQuery::queryAll("SELECT * FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 $visibility AND category = -1 ORDER BY title ASC"); 32 return DBQuery::queryAll("SELECT * 33 FROM {$database['prefix']}Entries 34 WHERE blogid = $blogid 35 AND draft = 0 $visibility 36 AND category = -1 37 ORDER BY title ASC"); 35 38 } 36 39 … … 57 60 $keyword = tc_escape_string($keyword); 58 61 $visibility = doesHaveOwnership() ? '' : 'AND visibility > 1'; 59 return DBQuery::query All("SELECT *62 return DBQuery::queryRow("SELECT * 60 63 FROM {$database['prefix']}Entries 61 64 WHERE blogid = $blogid … … 63 66 AND category = -1 64 67 AND title = '$keyword' 65 ORDER BY published DESC LIMIT 1");68 ORDER BY published DESC"); 66 69 } 67 70 -
trunk/lib/model/blog.link.php
r4681 r4683 4 4 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT) 5 5 6 global $__gCacheLink; 7 $__gCacheLink = array(); 8 6 9 function getLinks($blogid) { 7 global $database; 8 $links = array(); 9 if ($result = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Links WHERE blogid = $blogid ORDER BY name")) { 10 foreach($result as $link) 11 array_push($links, $link); 10 global $database, $__gCacheLink; 11 if(empty($__gCacheLink)) { 12 if ($result = DBQuery::queryAll("SELECT * 13 FROM {$database['prefix']}Links 14 WHERE blogid = $blogid 15 ORDER BY name")) { 16 $__gCacheLink = array(); 17 foreach($result as $link) { 18 array_push($__gCacheLink, $link); 19 } 20 } 12 21 } 13 return $ links;22 return $__gCacheLink; 14 23 } 15 24 … … 20 29 21 30 function getLink($blogid, $id) { 22 global $database ;23 return DBQuery::queryRow("SELECT * FROM {$database['prefix']}Links WHERE blogid = $blogid ANDid = $id");31 global $database, $__gCacheLink; 32 return DBQuery::queryRow("SELECT * FROM {$database['prefix']}Links WHERE blogid = $blogid and id = $id"); 24 33 } 25 34 -
trunk/setup.php
r4667 r4683 1209 1209 rss varchar(255) NOT NULL default '', 1210 1210 written int(11) NOT NULL default '0', 1211 visibility tinyint(4) NOT NULL default '2', 1212 xfn varchar(128) NOT NULL default '', 1211 1213 PRIMARY KEY (id), 1212 1214 UNIQUE KEY blogid (blogid,url)
