Fix notices
git-svn-id: https://develop.svn.wordpress.org/trunk@13068 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
113a86ebbd
commit
48d12af9f6
|
@ -472,9 +472,9 @@ class WP_Widget_Categories extends WP_Widget {
|
||||||
function update( $new_instance, $old_instance ) {
|
function update( $new_instance, $old_instance ) {
|
||||||
$instance = $old_instance;
|
$instance = $old_instance;
|
||||||
$instance['title'] = strip_tags($new_instance['title']);
|
$instance['title'] = strip_tags($new_instance['title']);
|
||||||
$instance['count'] = $new_instance['count'] ? 1 : 0;
|
$instance['count'] = !empty($new_instance['count']) ? 1 : 0;
|
||||||
$instance['hierarchical'] = $new_instance['hierarchical'] ? 1 : 0;
|
$instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
|
||||||
$instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
|
$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
|
||||||
|
|
||||||
return $instance;
|
return $instance;
|
||||||
}
|
}
|
||||||
|
@ -739,7 +739,7 @@ class WP_Widget_RSS extends WP_Widget {
|
||||||
}
|
}
|
||||||
|
|
||||||
function update($new_instance, $old_instance) {
|
function update($new_instance, $old_instance) {
|
||||||
$testurl = $new_instance['url'] != $old_instance['url'];
|
$testurl = ( isset($new_instance['url']) && ($new_instance['url'] != $old_instance['url']) );
|
||||||
return wp_widget_rss_process( $new_instance, $testurl );
|
return wp_widget_rss_process( $new_instance, $testurl );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -939,9 +939,9 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
|
||||||
$items = 10;
|
$items = 10;
|
||||||
$url = esc_url_raw(strip_tags( $widget_rss['url'] ));
|
$url = esc_url_raw(strip_tags( $widget_rss['url'] ));
|
||||||
$title = trim(strip_tags( $widget_rss['title'] ));
|
$title = trim(strip_tags( $widget_rss['title'] ));
|
||||||
$show_summary = (int) $widget_rss['show_summary'];
|
$show_summary = isset($widget_rss['show_summary']) ? (int) $widget_rss['show_summary'] : 0;
|
||||||
$show_author = (int) $widget_rss['show_author'];
|
$show_author = isset($widget_rss['show_author']) ? (int) $widget_rss['show_author'] :0;
|
||||||
$show_date = (int) $widget_rss['show_date'];
|
$show_date = isset($widget_rss['show_date']) ? (int) $widget_rss['show_date'] : 0;
|
||||||
|
|
||||||
if ( $check_feed ) {
|
if ( $check_feed ) {
|
||||||
$rss = fetch_feed($url);
|
$rss = fetch_feed($url);
|
||||||
|
|
|
@ -1087,7 +1087,7 @@ function get_calendar($initial = true, $echo = true) {
|
||||||
|
|
||||||
/* translators: Calendar caption: 1: month name, 2: 4-digit year */
|
/* translators: Calendar caption: 1: month name, 2: 4-digit year */
|
||||||
$calendar_caption = _x('%1$s %2$s', 'calendar caption');
|
$calendar_caption = _x('%1$s %2$s', 'calendar caption');
|
||||||
$calendar_output .= '<table id="wp-calendar" summary="' . esc_attr__('Calendar') . '">
|
$calendar_output = '<table id="wp-calendar" summary="' . esc_attr__('Calendar') . '">
|
||||||
<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
|
<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>';
|
<tr>';
|
||||||
|
@ -1206,7 +1206,7 @@ function get_calendar($initial = true, $echo = true) {
|
||||||
|
|
||||||
$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
|
$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
|
||||||
|
|
||||||
$cache[ $key ] = $output;
|
$cache[ $key ] = $calendar_output;
|
||||||
wp_cache_set( 'get_calendar', $cache, 'calendar' );
|
wp_cache_set( 'get_calendar', $cache, 'calendar' );
|
||||||
|
|
||||||
if ( $echo )
|
if ( $echo )
|
||||||
|
|
Loading…
Reference in New Issue