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

Remove old links_recently_updated_* DB options that never had a UI. 

fixes #27649.

Built from https://develop.svn.wordpress.org/trunk@27916


git-svn-id: http://core.svn.wordpress.org/trunk@27746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-04-03 03:10:15 +00:00
parent 079ddec045
commit 803d4ff54d
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/schema.php
View File

@ -392,9 +392,6 @@ function populate_options() {
'time_format' => __('g:i a'),
/* translators: links last updated date format, see http://php.net/date */
'links_updated_date_format' => __('F j, Y g:i a'),
'links_recently_updated_prepend' => '<em>',
'links_recently_updated_append' => '</em>',
'links_recently_updated_time' => 120,
'comment_moderation' => 0,
'moderation_notify' => 1,
'permalink_structure' => '',
@ -537,6 +534,7 @@ function populate_options() {
'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1',
'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5',
'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9',
'links_recently_updated_time', 'links_recently_updated_prepend', 'links_recently_updated_append',
'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat',
'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce',
'_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins',

4
wp-includes/bookmark-template.php
View File

@ -65,7 +65,7 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
$bookmark->recently_updated = false;
$output .= $before;
if ( $show_updated && $bookmark->recently_updated )
$output .= get_option('links_recently_updated_prepend');
$output .= '<em>';
$the_link = '#';
if ( !empty($bookmark->link_url) )
@ -116,7 +116,7 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
$output .= '</a>';
if ( $show_updated && $bookmark->recently_updated )
$output .= get_option('links_recently_updated_append');
$output .= '</em>';
if ( $show_description && '' != $desc )
$output .= $between . $desc;

4
wp-includes/bookmark.php
View File

@ -226,8 +226,8 @@ function get_bookmarks($args = '') {
$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
}
if ( $show_updated && get_option('links_recently_updated_time') ) {
$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
if ( $show_updated ) {
$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
} else {
$recently_updated_test = '';
}

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.9-beta3-27857';
*
* @global int $wp_db_version
*/
$wp_db_version = 26691;
$wp_db_version = 27916;
/**
* Holds the TinyMCE version