| Property changes on: branches/uploadwizard/phase3/bin |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/bin:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/COPYING |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/COPYING:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/img_auth.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/trackback.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/phase3/trackback.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /trunk/phase3/opensearch_desc.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /trunk/phase3/redirect.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/StartProfiler.sample |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /trunk/phase3/StartProfiler.sample:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/docs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /trunk/phase3/docs:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/math |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/phase3/math:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/load.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /trunk/phase3/load.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/index.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /trunk/phase3/index.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/api.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /trunk/phase3/api.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/trackback.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /trunk/phase3/trackback.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Merged /trunk/phase3/opensearch_desc.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/profileinfo.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 15 | Merged /trunk/phase3/profileinfo.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/images |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Merged /trunk/phase3/images:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/thumb.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 17 | 17 | Merged /trunk/phase3/thumb.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Merged /trunk/phase3/includes/ResourceLoader.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 19 | Merged /trunk/phase3/includes/json/Services_JSON.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 20 | 20 | Merged /trunk/phase3/includes/ConfEditor.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 21 | 21 | Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 22 | 22 | Merged /trunk/phase3/includes/Title.php:r74020-74029 |
| Index: branches/uploadwizard/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2449,19 +2449,21 @@ |
| 2450 | 2450 | $disabled = false; |
| 2451 | 2451 | if( wfIniGetBool( 'safe_mode' ) ) { |
| 2452 | 2452 | wfDebug( "wfShellExec can't run in safe_mode, PHP's exec functions are too broken.\n" ); |
| 2453 | | - $disabled = true; |
| | 2453 | + $disabled = 'safemode'; |
| 2454 | 2454 | } |
| 2455 | 2455 | $functions = explode( ',', ini_get( 'disable_functions' ) ); |
| 2456 | 2456 | $functions = array_map( 'trim', $functions ); |
| 2457 | 2457 | $functions = array_map( 'strtolower', $functions ); |
| 2458 | 2458 | if ( in_array( 'passthru', $functions ) ) { |
| 2459 | 2459 | wfDebug( "passthru is in disabled_functions\n" ); |
| 2460 | | - $disabled = true; |
| | 2460 | + $disabled = 'passthru'; |
| 2461 | 2461 | } |
| 2462 | 2462 | } |
| 2463 | 2463 | if ( $disabled ) { |
| 2464 | 2464 | $retval = 1; |
| 2465 | | - return 'Unable to run external programs in safe mode.'; |
| | 2465 | + return $disabled == 'safemode' ? |
| | 2466 | + 'Unable to run external programs in safe mode.' : |
| | 2467 | + 'Unable to run external programs, passthru() is disabled.'; |
| 2466 | 2468 | } |
| 2467 | 2469 | |
| 2468 | 2470 | wfInitShellLocale(); |
| Property changes on: branches/uploadwizard/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2469 | 2471 | Merged /trunk/phase3/includes/GlobalFunctions.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2470 | 2472 | Merged /trunk/phase3/includes/HistoryPage.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2471 | 2473 | Merged /trunk/phase3/includes/specials:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2472 | 2474 | Merged /trunk/phase3/includes/api:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2473 | 2475 | Merged /trunk/phase3/includes/ChangesList.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/Interwiki.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2474 | 2476 | Merged /trunk/phase3/includes/Interwiki.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2475 | 2477 | Merged /trunk/phase3/includes/OutputPage.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2476 | 2478 | Merged /trunk/phase3/includes:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2477 | 2479 | Merged /trunk/phase3/languages:r74020-74029 |
| Index: branches/uploadwizard/phase3/RELEASE-NOTES |
| — | — | @@ -341,6 +341,7 @@ |
| 342 | 342 | * (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second |
| 343 | 343 | parameter |
| 344 | 344 | * (bug 25167) Correctly load JS fixes for IE6 (fixing a regression in 1.16) |
| | 345 | +* (bug 25367) wfShellExec() is more explicit when failing due to disabled passthru() |
| 345 | 346 | |
| 346 | 347 | === API changes in 1.17 === |
| 347 | 348 | * (bug 22738) Allow filtering by action type on query=logevent. |
| Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 348 | 349 | Merged /trunk/phase3/RELEASE-NOTES:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/FAQ |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 349 | 350 | Merged /trunk/phase3/FAQ:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/resources |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 350 | 351 | Merged /trunk/phase3/resources:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/index.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 351 | 352 | Merged /trunk/phase3/index.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 352 | 353 | Merged /trunk/phase3/maintenance/cleanupTable.inc:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 353 | 354 | Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/populateRevisionLength.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 354 | 355 | Merged /trunk/phase3/maintenance/populateRevisionLength.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/archives |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 355 | 356 | Merged /trunk/phase3/maintenance/archives:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/tables.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 356 | 357 | Merged /trunk/phase3/maintenance/tables.sql:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance/tests |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 357 | 358 | Merged /trunk/phase3/maintenance/tests:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/maintenance |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 358 | 359 | Merged /trunk/phase3/maintenance:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 359 | 360 | Merged /trunk/phase3/img_auth.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/api.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 360 | 361 | Merged /trunk/phase3/api.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 361 | 362 | Merged /trunk/phase3/redirect.phtml:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/wiki.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 362 | 363 | Merged /trunk/phase3/wiki.phtml:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/php5.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 363 | 364 | Merged /trunk/phase3/php5.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/UPGRADE |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 364 | 365 | Merged /trunk/phase3/UPGRADE:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/skins |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 365 | 366 | Merged /trunk/phase3/skins:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/redirect.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 366 | 367 | Merged /trunk/phase3/redirect.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/thumb.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 367 | 368 | Merged /trunk/phase3/thumb.php5:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/serialized |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 368 | 369 | Merged /trunk/phase3/serialized:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/CREDITS |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 369 | 370 | Merged /trunk/phase3/CREDITS:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/README |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 370 | 371 | Merged /trunk/phase3/README:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/HISTORY |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 371 | 372 | Merged /trunk/phase3/HISTORY:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/cache |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 372 | 373 | Merged /trunk/phase3/cache:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/load.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 373 | 374 | Merged /trunk/phase3/load.php:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/config |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 374 | 375 | Merged /trunk/phase3/config:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3/INSTALL |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 375 | 376 | Merged /trunk/phase3/INSTALL:r74020-74029 |
| Property changes on: branches/uploadwizard/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 376 | 377 | Merged /trunk/phase3:r74020-74029* |
| Property changes on: branches/uploadwizard/extensions/ContactPageFundraiser |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 377 | 378 | Merged /trunk/phase3/extensions/ContactPageFundraiser:r74020-74029 |
| Property changes on: branches/uploadwizard/extensions/LocalisationUpdate |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 378 | 379 | Merged /trunk/phase3/extensions/LocalisationUpdate:r74020-74029 |
| Property changes on: branches/uploadwizard/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 379 | 380 | Merged /trunk/phase3/extensions:r74020-74029 |