| Index: branches/REL1_17/extensions/TrustedXFF/trusted-hosts.txt |
| — | — | @@ -1272,3 +1272,14 @@ |
| 1273 | 1273 | s-lb-a01.isp.t-ipnet.de |
| 1274 | 1274 | do-lb-a01.isp.t-ipnet.de |
| 1275 | 1275 | |
| | 1276 | +# websense.net security proxy service |
| | 1277 | +# Source: email, reverse DNS |
| | 1278 | +85.115.52.180 |
| | 1279 | +85.115.54.180 |
| | 1280 | +85.115.60.180 |
| | 1281 | +85.115.58.180 |
| | 1282 | +208.87.233.180 |
| | 1283 | +208.87.234.180 |
| | 1284 | +116.50.57.180 |
| | 1285 | +116.50.58.180 |
| | 1286 | + |
| Property changes on: branches/REL1_17/extensions/TrustedXFF/trusted-hosts.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1276 | 1287 | Merged /trunk/extensions/TrustedXFF/trusted-hosts.txt:r78622 |
| Index: branches/REL1_17/phase3/maintenance/Maintenance.php |
| — | — | @@ -102,10 +102,16 @@ |
| 103 | 103 | protected static $mCoreScripts = null; |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | | - * Default constructor. Children should call this if implementing |
| | 106 | + * Default constructor. Children should call this *first* if implementing |
| 107 | 107 | * their own constructors |
| 108 | 108 | */ |
| 109 | 109 | public function __construct() { |
| | 110 | + // Setup $IP, using MW_INSTALL_PATH if it exists |
| | 111 | + global $IP; |
| | 112 | + $IP = strval( getenv( 'MW_INSTALL_PATH' ) ) !== '' |
| | 113 | + ? getenv( 'MW_INSTALL_PATH' ) |
| | 114 | + : realpath( dirname( __FILE__ ) . '/..' ); |
| | 115 | + |
| 110 | 116 | $this->addDefaultParams(); |
| 111 | 117 | register_shutdown_function( array( $this, 'outputChanneled' ), false ); |
| 112 | 118 | } |
| — | — | @@ -415,7 +421,7 @@ |
| 416 | 422 | * Do some sanity checking and basic setup |
| 417 | 423 | */ |
| 418 | 424 | public function setup() { |
| 419 | | - global $IP, $wgCommandLineMode, $wgRequestTime; |
| | 425 | + global $wgCommandLineMode, $wgRequestTime; |
| 420 | 426 | |
| 421 | 427 | # Abort if called from a web server |
| 422 | 428 | if ( isset( $_SERVER ) && isset( $_SERVER['REQUEST_METHOD'] ) ) { |
| — | — | @@ -459,11 +465,6 @@ |
| 460 | 466 | # Define us as being in MediaWiki |
| 461 | 467 | define( 'MEDIAWIKI', true ); |
| 462 | 468 | |
| 463 | | - # Setup $IP, using MW_INSTALL_PATH if it exists |
| 464 | | - $IP = strval( getenv( 'MW_INSTALL_PATH' ) ) !== '' |
| 465 | | - ? getenv( 'MW_INSTALL_PATH' ) |
| 466 | | - : realpath( dirname( __FILE__ ) . '/..' ); |
| 467 | | - |
| 468 | 469 | $wgCommandLineMode = true; |
| 469 | 470 | # Turn off output buffering if it's on |
| 470 | 471 | @ob_end_flush(); |
| Index: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -597,11 +597,16 @@ |
| 598 | 598 | 'label' => 'config-admin-email', |
| 599 | 599 | 'help' => $this->parent->getHelpBox( 'config-admin-email-help' ) |
| 600 | 600 | ) ) . |
| 601 | | - $this->parent->getCheckBox( array( |
| | 601 | + /** |
| | 602 | + * Uncomment this feature once we've got some sort of API to mailman |
| | 603 | + * to handle these subscriptions. Some dummy wrapper script on the |
| | 604 | + * mailman box that shell's out to mailman/bin/add_members would do |
| | 605 | + $this->parent->getCheckBox( array( |
| 602 | 606 | 'var' => '_Subscribe', |
| 603 | 607 | 'label' => 'config-subscribe', |
| 604 | 608 | 'help' => $this->parent->getHelpBox( 'config-subscribe-help' ) |
| 605 | 609 | ) ) . |
| | 610 | + */ |
| 606 | 611 | $this->getFieldSetEnd() . |
| 607 | 612 | $this->parent->getInfoBox( wfMsg( 'config-almost-done' ) ) . |
| 608 | 613 | $this->parent->getRadioSet( array( |
| Property changes on: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 609 | 614 | Merged /branches/REL1_15/phase3/includes/installer/WebInstallerPage.php:r51646 |
| 610 | 615 | Merged /branches/sqlite/includes/installer/WebInstallerPage.php:r58211-58321 |
| 611 | 616 | Merged /trunk/phase3/includes/installer/WebInstallerPage.php:r79089 |
| 612 | 617 | Merged /branches/new-installer/phase3/includes/installer/WebInstallerPage.php:r43664-66004 |
| 613 | 618 | Merged /branches/wmf-deployment/includes/installer/WebInstallerPage.php:r53381 |
| Index: branches/REL1_17/phase3/includes/Article.php |
| — | — | @@ -1478,7 +1478,7 @@ |
| 1479 | 1479 | $parserOptions->setIsPrintable( $wgOut->isPrintable() ); |
| 1480 | 1480 | |
| 1481 | 1481 | # Don't show section-edit links on old revisions... this way lies madness. |
| 1482 | | - if ( !$this->isCurrent() || $wgOut->isPrintable() ) { |
| | 1482 | + if ( !$this->isCurrent() || $wgOut->isPrintable() || !$this->mTitle->quickUserCan( 'edit' ) ) { |
| 1483 | 1483 | $parserOptions->setEditSection( false ); |
| 1484 | 1484 | } |
| 1485 | 1485 | |
| Property changes on: branches/REL1_17/phase3/includes/Article.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1486 | 1486 | Merged /branches/sqlite/includes/Article.php:r58211-58321 |
| 1487 | 1487 | Merged /trunk/phase3/includes/Article.php:r79185 |
| 1488 | 1488 | Merged /branches/new-installer/phase3/includes/Article.php:r43664-66004 |
| 1489 | 1489 | Merged /branches/wmf-deployment/includes/Article.php:r53381 |
| 1490 | 1490 | Merged /branches/REL1_15/phase3/includes/Article.php:r51646 |
| Index: branches/REL1_17/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1988,7 +1988,7 @@ |
| 1989 | 1989 | $da = array(); |
| 1990 | 1990 | $strtime = ''; |
| 1991 | 1991 | |
| 1992 | | - if ( $ts === 0 ) { |
| | 1992 | + if ( !$ts ) { // We want to catch 0, '', null... but not date strings starting with a letter. |
| 1993 | 1993 | $uts = time(); |
| 1994 | 1994 | $strtime = "@$uts"; |
| 1995 | 1995 | } elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) { |
| — | — | @@ -2028,7 +2028,7 @@ |
| 2029 | 2029 | # asctime |
| 2030 | 2030 | $strtime = $ts; |
| 2031 | 2031 | } else { |
| 2032 | | - # Bogus value; fall back to the epoch... |
| | 2032 | + # Bogus value... |
| 2033 | 2033 | wfDebug("wfTimestamp() fed bogus time value: $outputtype; $ts\n"); |
| 2034 | 2034 | |
| 2035 | 2035 | return false; |
| Property changes on: branches/REL1_17/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2036 | 2036 | Merged /trunk/phase3/includes/GlobalFunctions.php:r79213-79214,79253 |
| Index: branches/REL1_17/phase3/includes/api/ApiQueryPageProps.php |
| — | — | @@ -47,6 +47,10 @@ |
| 48 | 48 | |
| 49 | 49 | # Only operate on existing pages |
| 50 | 50 | $pages = $this->getPageSet()->getGoodTitles(); |
| | 51 | + if ( !count( $pages ) ) { |
| | 52 | + # Nothing to do |
| | 53 | + return; |
| | 54 | + } |
| 51 | 55 | |
| 52 | 56 | $this->addTables( 'page_props' ); |
| 53 | 57 | $this->addFields( array( 'pp_page', 'pp_propname', 'pp_value' ) ); |
| Property changes on: branches/REL1_17/phase3/includes/api/ApiQueryPageProps.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 54 | 58 | Merged /branches/wmf-deployment/includes/api/ApiQueryPageProps.php:r53381,59952 |
| 55 | 59 | Merged /branches/REL1_15/phase3/includes/api/ApiQueryPageProps.php:r51646 |
| 56 | 60 | Merged /branches/REL1_16/phase3/includes/api/ApiQueryPageProps.php:r63621-63636,69357 |
| 57 | 61 | Merged /branches/wmf/1.16wmf4/includes/api/ApiQueryPageProps.php:r69521 |
| 58 | 62 | Merged /branches/sqlite/includes/api/ApiQueryPageProps.php:r58211-58321 |
| 59 | 63 | Merged /trunk/phase3/includes/api/ApiQueryPageProps.php:r79199 |