WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now select categories from new table and such. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2003-12-07 08:59:05 +00:00
parent e011cfc534
commit 42df6fbd9a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
blog.header.php
View File

@ -13,7 +13,7 @@ require_once ($curpath.$b2inc.'/b2functions.php');
require_once ($curpath.$b2inc.'/xmlrpc.inc'); require_once ($curpath.$b2inc.'/xmlrpc.inc');
require_once ($curpath.$b2inc.'/xmlrpcs.inc'); require_once ($curpath.$b2inc.'/xmlrpcs.inc');
$b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_nicename'); $b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'name', 'category_name');
for ($i=0; $i<count($b2varstoreset); $i += 1) { for ($i=0; $i<count($b2varstoreset); $i += 1) {
$b2var = $b2varstoreset[$i]; $b2var = $b2varstoreset[$i];
@ -58,6 +58,7 @@ $result = '';
$where = ''; $where = '';
$limits = ''; $limits = '';
$distinct = ''; $distinct = '';
$join = '';
if ($pagenow != 'wp-post.php') { timer_start(); } if ($pagenow != 'wp-post.php') { timer_start(); }
@ -155,13 +156,23 @@ if ((empty($cat)) || ($cat == 'all') || ($cat == '0')) {
$eq = '='; $eq = '=';
$andor = 'OR'; $andor = 'OR';
} }
$join = " LEFT JOIN $tablepost2cat ON ($tableposts.ID = $tablepost2cat.post_id) ";
$cat_array = explode(' ',$cat); $cat_array = explode(' ',$cat);
$whichcat .= ' AND (post_category '.$eq.' '.intval($cat_array[0]); $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
for ($i = 1; $i < (count($cat_array)); $i = $i + 1) { for ($i = 1; $i < (count($cat_array)); $i = $i + 1) {
$whichcat .= ' '.$andor.' post_category '.$eq.' '.intval($cat_array[$i]); $whichcat .= ' '.$andor.' post_category '.$eq.' '.intval($cat_array[$i]);
} }
$whichcat .= ')'; $whichcat .= ')';
} }
// Category stuff for nice URIs
if ('' != $category_name) {
$category_name = preg_replace('|[^a-z0-9-/]|', '', $category_name);
$join = " LEFT JOIN $tablepost2cat ON ($tableposts.ID = $tablepost2cat.post_id) LEFT JOIN $tablecategories ON ($tablepost2cat.category_id = $tablecategories.cat_ID) ";
$whichcat = " AND (category_nicename = '$category_name') ";
}
// author stuff // author stuff
if ((empty($author)) || ($author == 'all') || ($author == '0')) { if ((empty($author)) || ($author == 'all') || ($author == '0')) {
$whichauthor=''; $whichauthor='';
@ -293,7 +304,7 @@ if (isset($user_ID) && ('' != intval($user_ID)))
$where .= " OR post_author = $user_ID AND post_status != 'draft')"; $where .= " OR post_author = $user_ID AND post_status != 'draft')";
else else
$where .= ')'; $where .= ')';
$request = " SELECT $distinct * FROM $tableposts WHERE 1=1".$where." ORDER BY post_$orderby $limits"; $request = " SELECT $distinct * FROM $tableposts $join WHERE 1=1".$where." ORDER BY post_$orderby $limits";
if ($preview) { if ($preview) {