| Index: branches/REL1_15/phase3/maintenance/updaters.inc |
| — | — | @@ -144,7 +144,6 @@ |
| 145 | 145 | array( 'check_bin', 'protected_titles', 'pt_title', 'patch-pt_title-encoding.sql', ), |
| 146 | 146 | array( 'maybe_do_profiling_memory_update' ), |
| 147 | 147 | array( 'do_filearchive_indices_update' ), |
| 148 | | - array( 'update_password_format' ), |
| 149 | 148 | |
| 150 | 149 | // 1.14 |
| 151 | 150 | array( 'add_field', 'site_stats', 'ss_active_users', 'patch-ss_active_users.sql' ), |
| — | — | @@ -258,41 +257,6 @@ |
| 259 | 258 | } |
| 260 | 259 | } |
| 261 | 260 | |
| 262 | | -function do_revision_updates() { |
| 263 | | - global $wgSoftwareRevision; |
| 264 | | - if ( $wgSoftwareRevision < 1001 ) { |
| 265 | | - update_passwords(); |
| 266 | | - } |
| 267 | | -} |
| 268 | | - |
| 269 | | -function update_passwords() { |
| 270 | | - wfDebugDieBacktrace( "This function needs to be updated or removed.\n" ); |
| 271 | | - |
| 272 | | - global $wgDatabase; |
| 273 | | - $fname = "Update script: update_passwords()"; |
| 274 | | - wfOut( "\nIt appears that you need to update the user passwords in your\n" . |
| 275 | | - "database. If you have already done this (if you've run this update\n" . |
| 276 | | - "script once before, for example), doing so again will make all your\n" . |
| 277 | | - "user accounts inaccessible, so be sure you only do this once.\n" . |
| 278 | | - "Update user passwords? (yes/no)" ); |
| 279 | | - |
| 280 | | - $resp = readconsole(); |
| 281 | | - if ( ! ( "Y" == $resp{0} || "y" == $resp{0} ) ) { return; } |
| 282 | | - |
| 283 | | - $sql = "SELECT user_id,user_password FROM user"; |
| 284 | | - $source = $wgDatabase->query( $sql, $fname ); |
| 285 | | - |
| 286 | | - while ( $row = $wgDatabase->fetchObject( $source ) ) { |
| 287 | | - $id = $row->user_id; |
| 288 | | - $oldpass = $row->user_password; |
| 289 | | - $newpass = md5( "{$id}-{$oldpass}" ); |
| 290 | | - |
| 291 | | - $sql = "UPDATE user SET user_password='{$newpass}' " . |
| 292 | | - "WHERE user_id={$id}"; |
| 293 | | - $wgDatabase->query( $sql, $fname ); |
| 294 | | - } |
| 295 | | -} |
| 296 | | - |
| 297 | 261 | function do_interwiki_update() { |
| 298 | 262 | # Check that interwiki table exists; if it doesn't source it |
| 299 | 263 | global $wgDatabase, $IP; |
| — | — | @@ -1255,29 +1219,6 @@ |
| 1256 | 1220 | populate_rev_parent_id( $wgDatabase ); |
| 1257 | 1221 | } |
| 1258 | 1222 | |
| 1259 | | -function update_password_format() { |
| 1260 | | - if ( update_row_exists( 'password format' ) ) { |
| 1261 | | - wfOut( "...password hash format already changed\n" ); |
| 1262 | | - return; |
| 1263 | | - } |
| 1264 | | - |
| 1265 | | - wfOut( "Updating password hash format..." ); |
| 1266 | | - |
| 1267 | | - global $wgDatabase, $wgPasswordSalt; |
| 1268 | | - $user = $wgDatabase->tableName( 'user' ); |
| 1269 | | - if ( $wgPasswordSalt ) { |
| 1270 | | - $sql = "UPDATE $user SET user_password=CONCAT(':B:', user_id, ':', user_password) " . |
| 1271 | | - "WHERE user_password NOT LIKE ':%'"; |
| 1272 | | - } else { |
| 1273 | | - $sql = "UPDATE $user SET user_password=CONCAT(':A:', user_password) " . |
| 1274 | | - "WHERE user_password NOT LIKE ':%'"; |
| 1275 | | - } |
| 1276 | | - $wgDatabase->query( $sql, __METHOD__ ); |
| 1277 | | - $wgDatabase->insert( 'updatelog', array( 'ul_key' => 'password format' ), __METHOD__ ); |
| 1278 | | - |
| 1279 | | - wfOut( "done\n" ); |
| 1280 | | -} |
| 1281 | | - |
| 1282 | 1223 | function sqlite_initial_indexes() { |
| 1283 | 1224 | global $wgDatabase; |
| 1284 | 1225 | if ( update_row_exists( 'initial_indexes' ) ) { |
| Property changes on: branches/REL1_15/phase3/includes/parser |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1285 | 1226 | - /trunk/phase3/includes/parser:48836,48886,48892,48989,48992,49002,49051,49068,49086,49142,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470 |
| /trunk/phase3/includes/specials/parser:48993 |
| 1286 | 1227 | + /trunk/phase3/includes/parser:48836,48886,48892,48989,48992,49002,49051,49068,49086,49142,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,51587 |
| /trunk/phase3/includes/specials/parser:48993 |
| Property changes on: branches/REL1_15/phase3/includes/db |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1287 | 1228 | - /trunk/phase3/includes/db:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50473,50580,50614 |
| /trunk/phase3/includes/specials/db:48993 |
| 1288 | 1229 | + /trunk/phase3/includes/db:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50473,50580,50614,51587 |
| /trunk/phase3/includes/specials/db:48993 |
| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1289 | 1230 | - /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,50833 |
| 1290 | 1231 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,50833,51587 |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1291 | 1232 | - /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580 |
| /trunk/phase3/includes/specials/specials:48993 |
| 1292 | 1233 | + /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,51587 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1293 | 1234 | - /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580 |
| /trunk/phase3/includes/specials:48993 |
| 1294 | 1235 | + /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,51587 |
| /trunk/phase3/includes/specials:48993 |
| Index: branches/REL1_15/phase3/RELEASE-NOTES |
| — | — | @@ -3,11 +3,11 @@ |
| 4 | 4 | Security reminder: MediaWiki does not require PHP's register_globals |
| 5 | 5 | setting since version 1.2.0. If you have it on, turn it *off* if you can. |
| 6 | 6 | |
| 7 | | -== MediaWiki 1.15.0rc1 == |
| | 7 | +== MediaWiki 1.15.0 == |
| 8 | 8 | |
| 9 | | -2009-05-16 |
| | 9 | +2009-06-09 |
| 10 | 10 | |
| 11 | | -This is a release candidate for the the 2009 Q2 branch of MediaWiki. |
| | 11 | +This is a stable release of the the 2009 Q2 branch of MediaWiki. |
| 12 | 12 | |
| 13 | 13 | MediaWiki is now using a "continuous integration" development model with |
| 14 | 14 | quarterly snapshot releases. The latest development code is always kept |
| — | — | @@ -22,7 +22,8 @@ |
| 23 | 23 | |
| 24 | 24 | === Changes since 1.15.0rc1 === |
| 25 | 25 | |
| 26 | | -* Removed category redirect feature (bug 3311) |
| | 26 | +* Removed category redirect feature, implementation was incomplete. |
| | 27 | +* (bug 18846) Remove update_password_format(), unnecessary, destroys all passwords if a wiki with $wgPasswordSalt=false is upgraded with the web installer. |
| 27 | 28 | |
| 28 | 29 | === Configuration changes in 1.15 === |
| 29 | 30 | |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 30 | 31 | - /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580 |
| 31 | 32 | + /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,51587 |