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,11 @@ +wordpress (2.5.1-9ubuntu2) jaunty; urgency=low + + * debian/patches/010_remove_update_notice.patch: + change this patch from 2.5.1-9ubuntu1 so as to uncomment the if-statement + as well. Otherwise there is an imbalance. + + -- Rolf Leggewie Fri, 14 Nov 2008 17:47:29 +0100 + wordpress (2.5.1-9ubuntu1) jaunty; 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 @@ -1,5 +1,6 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 010_remove_update_notice.patch.dpatch by Emanuele Gentili +## slightly changed by Rolf Leggewie ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix for remove wordpress update notify in admin dashboard. @@ -8,16 +9,18 @@ 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 @@ +@@ -33,10 +33,10 @@ + if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) return false; - 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 ); +-// 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 ); ++ 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 ); echo "
$msg
"; }