diff -u wordpress-2.5.1/debian/changelog wordpress-2.5.1/debian/changelog --- wordpress-2.5.1/debian/changelog +++ wordpress-2.5.1/debian/changelog @@ -1,3 +1,10 @@ +wordpress (2.5.1-8ubuntu2) intrepid; urgency=low + + * supersede debian/patches/010_remove_update_notice.patch with + improved version from LP bug 227547. + + -- Rolf Leggewie Sun, 23 Nov 2008 19:04:41 +0100 + wordpress (2.5.1-8ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: diff -u wordpress-2.5.1/debian/patches/010_remove_update_notice.patch wordpress-2.5.1/debian/patches/010_remove_update_notice.patch --- wordpress-2.5.1/debian/patches/010_remove_update_notice.patch +++ wordpress-2.5.1/debian/patches/010_remove_update_notice.patch @@ -2,22 +2,48 @@ -## 010_remove_update_notice.patch.dpatch by Emanuele Gentili +## 010_remove_update_notice.patch.dpatch by Rolf Leggewie ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix for remove wordpress update notify in admin dashboard. +## DP: Fix to remove wordpress update notify in admin dashboard. @DPATCH@ -diff -urNad wordpress-2.5.1-5ubuntu1~/wp-admin/includes/update.php wordpress-2.5.1-5ubuntu1/wp-admin/includes/update.php ---- wordpress-2.5.1-5ubuntu1~/wp-admin/includes/update.php 2008-07-13 19:55:36.000000000 +0200 -+++ wordpress-2.5.1-5ubuntu1/wp-admin/includes/update.php 2008-07-23 02:24:09.000000000 +0200 -@@ -34,9 +34,9 @@ - return false; +--- wp-admin/includes/update.php.orig 2008-11-23 19:08:53.000000000 +0100 ++++ wp-admin/includes/update.php 2008-11-23 19:08:01.000000000 +0100 +@@ -3,27 +3,8 @@ + // The admin side of our 1.1 update system - if ( current_user_can('manage_options') ) -- $msg = sprintf( __('WordPress %2$s is available! Please update now.'), $cur->url, $cur->current ); -- else -- $msg = sprintf( __('WordPress %2$s is available! Please notify the site administrator.'), $cur->url, $cur->current ); -+// $msg = sprintf( __('WordPress %2$s is available! Please update now.'), $cur->url, $cur->current ); -+// else -+// $msg = sprintf( __('WordPress %2$s is available! Please notify the site administrator.'), $cur->url, $cur->current ); + function core_update_footer( $msg = '' ) { +- if ( !current_user_can('manage_options') ) +- return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); +- +- $cur = get_option( 'update_core' ); +- +- switch ( $cur->response ) { +- case 'development' : +- return sprintf( '| '.__( 'You are using a development version (%s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); +- break; +- +- case 'upgrade' : +- if ( current_user_can('manage_options') ) { +- return sprintf( '| '.__( 'Get Version %3$s' ).'', $GLOBALS['wp_version'], $cur->url, $cur->current ); +- break; +- } +- +- case 'latest' : +- default : +- return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); +- break; +- } ++ // updates are managed by the distribution, no need for a warning ++ return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); + } + add_filter( 'update_footer', 'core_update_footer' ); + +@@ -40,7 +21,8 @@ echo "
$msg
"; } +-add_action( 'admin_notices', 'update_nag', 3 ); ++// # updates are managed by the distribution, no need for a warning message ++//add_action( 'admin_notices', 'update_nag', 3 ); + + // Called directly from dashboard + function update_right_now_message() { only in patch2: unchanged: --- wordpress-2.5.1.orig/wp-admin/includes/update.php +++ wordpress-2.5.1/wp-admin/includes/update.php @@ -3,27 +3,8 @@ // The admin side of our 1.1 update system function core_update_footer( $msg = '' ) { - if ( !current_user_can('manage_options') ) - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); - - $cur = get_option( 'update_core' ); - - switch ( $cur->response ) { - case 'development' : - return sprintf( '| '.__( 'You are using a development version (%s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); - break; - - case 'upgrade' : - if ( current_user_can('manage_options') ) { - return sprintf( '| '.__( 'Get Version %3$s' ).'', $GLOBALS['wp_version'], $cur->url, $cur->current ); - break; - } - - case 'latest' : - default : - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'], $cur->url, $cur->current ); - break; - } + // updates are managed by the distribution, no need for a warning + return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); } add_filter( 'update_footer', 'core_update_footer' ); @@ -40,7 +21,8 @@ echo "
$msg
"; } -add_action( 'admin_notices', 'update_nag', 3 ); +// # updates are managed by the distribution, no need for a warning message +//add_action( 'admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() {