golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added checks to category functions for empty results. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
emc3 2003-10-07 21:48:32 +00:00
parent 4574bd5dcb
commit 240c3ea9d8
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
b2-include/b2template.functions.php
View File

@ -1047,19 +1047,21 @@ function dropdown_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_
$all = apply_filters('list_cats', $all); $all = apply_filters('list_cats', $all);
echo "\t<option value='all'>$all</option>\n"; echo "\t<option value='all'>$all</option>\n";
} }
foreach ($categories as $category) { if ($categories) {
$cat_name = apply_filters('list_cats', $category->cat_name); foreach ($categories as $category) {
echo "\t<option value=\"".$category->cat_ID."\""; $cat_name = apply_filters('list_cats', $category->cat_name);
if ($category->cat_ID == $cat) echo "\t<option value=\"".$category->cat_ID."\"";
echo ' selected="selected"'; if ($category->cat_ID == $cat)
echo '>'.stripslashes($cat_name); echo ' selected="selected"';
if (intval($optioncount) == 1) { echo '>'.stripslashes($cat_name);
echo '&nbsp;&nbsp;('.$category->cat_count.')'; if (intval($optioncount) == 1) {
} echo '&nbsp;&nbsp;('.$category->cat_count.')';
if (intval($optiondates) == 1) { }
echo '&nbsp;&nbsp;'.$category->lastday.'/'.$category->lastmonth; if (intval($optiondates) == 1) {
} echo '&nbsp;&nbsp;'.$category->lastday.'/'.$category->lastmonth;
echo "</option>\n"; }
echo "</option>\n";
}
} }
echo "</select>\n"; echo "</select>\n";
} }
@ -1087,6 +1089,15 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
$query .= " ORDER BY $sort_column $sort_order, post_date DESC"; $query .= " ORDER BY $sort_column $sort_order, post_date DESC";
$categories = $wpdb->get_results($query); $categories = $wpdb->get_results($query);
if (!$categories) {
if ($list) {
$before = '<li>';
$after = '</li>';
}
echo $before . "No categories" . $after . "\n";
return;
}
++$querycount; ++$querycount;
if (intval($optionall) == 1) { if (intval($optionall) == 1) {
$all = apply_filters('list_cats', $all); $all = apply_filters('list_cats', $all);
@ -1094,6 +1105,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
if ($list) echo "\n\t<li>$link</li>"; if ($list) echo "\n\t<li>$link</li>";
else echo "\t$link<br />\n"; else echo "\t$link<br />\n";
} }
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="'.$file.$querystring_start.'cat'.$querystring_equal.$category->cat_ID.'">'; $link = '<a href="'.$file.$querystring_start.'cat'.$querystring_equal.$category->cat_ID.'">';