Query optimizations.
git-svn-id: http://svn.automattic.com/wordpress/trunk@683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
29c9a3c8cd
commit
6245f53042
|
@ -1340,7 +1340,7 @@ function get_the_category() {
|
||||||
return $categories;
|
return $categories;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_category_link($echo = false, $category_id) {
|
function get_category_link($echo = false, $category_id, $category_nicename) {
|
||||||
global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $siteurl, $blogfilename;
|
global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $siteurl, $blogfilename;
|
||||||
$cat_ID = $category_id;
|
$cat_ID = $category_id;
|
||||||
$permalink_structure = get_settings('permalink_structure');
|
$permalink_structure = get_settings('permalink_structure');
|
||||||
|
@ -1349,7 +1349,7 @@ function get_category_link($echo = false, $category_id) {
|
||||||
$file = "$siteurl/$blogfilename";
|
$file = "$siteurl/$blogfilename";
|
||||||
$link = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
|
$link = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
|
||||||
} else {
|
} else {
|
||||||
$category_nicename = $wpdb->get_var("SELECT category_nicename FROM $tablecategories WHERE cat_ID = $category_id");
|
if ('' == $category_nicename) $category_nicename = $wpdb->get_var("SELECT category_nicename FROM $tablecategories WHERE cat_ID = $category_id");
|
||||||
// Get any static stuff from the front
|
// Get any static stuff from the front
|
||||||
$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
|
$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
|
||||||
$link = $siteurl . $front . 'category/' . $category_nicename;
|
$link = $siteurl . $front . 'category/' . $category_nicename;
|
||||||
|
@ -1365,7 +1365,7 @@ function the_category($seperator = '') {
|
||||||
echo '<ul class="post-categories">';
|
echo '<ul class="post-categories">';
|
||||||
foreach ($categories as $category) {
|
foreach ($categories as $category) {
|
||||||
$category->cat_name = stripslashes($category->cat_name);
|
$category->cat_name = stripslashes($category->cat_name);
|
||||||
echo "\n\t<li><a href='" . get_category_link(0, $category->category_id) . "' title='View all posts in $category->cat_name'>$category->cat_name</a></li>";
|
echo "\n\t<li><a href='" . get_category_link(0, $category->category_id, $category->category_nicename) . "' title='View all posts in $category->cat_name'>$category->cat_name</a></li>";
|
||||||
}
|
}
|
||||||
echo '</ul>';
|
echo '</ul>';
|
||||||
} else {
|
} else {
|
||||||
|
@ -1373,7 +1373,7 @@ function the_category($seperator = '') {
|
||||||
foreach ($categories as $category) {
|
foreach ($categories as $category) {
|
||||||
$category->cat_name = stripslashes($category->cat_name);
|
$category->cat_name = stripslashes($category->cat_name);
|
||||||
if (0 < $i) echo $seperator . ' ';
|
if (0 < $i) echo $seperator . ' ';
|
||||||
echo "<a href='" . get_category_link(0, $category->category_id) . "' title='View all posts in $category->cat_name'>$category->cat_name</a>";
|
echo "<a href='" . get_category_link(0, $category->category_id, $category->category_nicename) . "' title='View all posts in $category->cat_name'>$category->cat_name</a>";
|
||||||
++$i;
|
++$i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1491,7 +1491,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
|
||||||
$sort_column = 'cat_'.$sort_column;
|
$sort_column = 'cat_'.$sort_column;
|
||||||
|
|
||||||
$query = "
|
$query = "
|
||||||
SELECT cat_ID, cat_name,
|
SELECT cat_ID, cat_name, category_nicename,
|
||||||
COUNT($tablepost2cat.post_id) AS cat_count,
|
COUNT($tablepost2cat.post_id) AS cat_count,
|
||||||
DAYOFMONTH(MAX(post_date)) AS lastday, MONTH(MAX(post_date)) AS lastmonth
|
DAYOFMONTH(MAX(post_date)) AS lastday, MONTH(MAX(post_date)) AS lastmonth
|
||||||
FROM $tablecategories LEFT JOIN $tablepost2cat ON (cat_ID = category_id)
|
FROM $tablecategories LEFT JOIN $tablepost2cat ON (cat_ID = category_id)
|
||||||
|
@ -1522,7 +1522,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
|
||||||
|
|
||||||
foreach ($categories as $category) {
|
foreach ($categories as $category) {
|
||||||
$cat_name = apply_filters('list_cats', $category->cat_name);
|
$cat_name = apply_filters('list_cats', $category->cat_name);
|
||||||
$link = '<a href="'.get_category_link(0, $category->cat_ID).'" title="View all posts filed under ' . $category->cat_name . '">';
|
$link = '<a href="'.get_category_link(0, $category->cat_ID, $category->category_nicename).'" title="View all posts filed under ' . $category->cat_name . '">';
|
||||||
$link .= stripslashes($cat_name).'</a>';
|
$link .= stripslashes($cat_name).'</a>';
|
||||||
if (intval($optioncount) == 1) {
|
if (intval($optioncount) == 1) {
|
||||||
$link .= ' ('.$category->cat_count.')';
|
$link .= ' ('.$category->cat_count.')';
|
||||||
|
|
Loading…
Reference in New Issue