| Index: branches/REL1_18/extensions/ConfirmEdit/QuestyCaptcha.class.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | global $wgOut; |
| 66 | 66 | $wgOut->setPageTitle( wfMsg( 'captchahelp-title' ) ); |
| 67 | 67 | $wgOut->addWikiText( wfMsg( 'questycaptchahelp-text' ) ); |
| 68 | | - if ( $this->storage->cookiesNeeded() ) { |
| | 68 | + if ( CaptchaStore::get()->cookiesNeeded() ) { |
| 69 | 69 | $wgOut->addWikiText( wfMsg( 'captchahelp-cookies-needed' ) ); |
| 70 | 70 | } |
| 71 | 71 | } |
| Index: branches/REL1_18/extensions/ConfirmEdit/FancyCaptcha.class.php |
| — | — | @@ -72,6 +72,9 @@ |
| 73 | 73 | Xml::element( 'input', array( |
| 74 | 74 | 'name' => 'wpCaptchaWord', |
| 75 | 75 | 'id' => 'wpCaptchaWord', |
| | 76 | + 'autocorrect' => 'off', |
| | 77 | + 'autocapitalize' => 'off', |
| | 78 | + 'required', |
| 76 | 79 | 'tabindex' => 1 ) ) . // tab in before the edit textarea |
| 77 | 80 | "</p>\n"; |
| 78 | 81 | } |
| Index: branches/REL1_18/extensions/UserDailyContribs/api/ApiUserDailyContribs.php |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | $days = $params['daysago']; |
| 12 | 12 | $user = User::newFromName($userName); |
| 13 | 13 | if ( !$user ) { |
| | 14 | + if ( !$wgAuth->userExists( $userName ) ) { |
| 14 | 15 | $this->dieUsage( 'Specified user does not exist', 'bad_user' ); |
| 15 | 16 | } |
| 16 | 17 | |
| Index: branches/REL1_18/extensions/UserDailyContribs/UserDailyContribs.php |
| — | — | @@ -32,6 +32,16 @@ |
| 33 | 33 | $wgAPIModules['userdailycontribs'] = 'ApiUserDailyContribs'; |
| 34 | 34 | |
| 35 | 35 | /** |
| | 36 | + * Whether or not API calls should require |
| | 37 | + * that the given user name exists in whatever authentication |
| | 38 | + * is set up in $wgAuth. Note that by default, on a plain install |
| | 39 | + * there is no authentication plugin, hence all checks for existance |
| | 40 | + * return to false. |
| | 41 | + * If you use CentralAuth you'd probably want to set this to true. |
| | 42 | + */ |
| | 43 | +$wgUserDailyContributionsApiCheckAuthPlugin = false; |
| | 44 | + |
| | 45 | +/** |
| 36 | 46 | * Get the number of revisions a user has made since a given time |
| 37 | 47 | * |
| 38 | 48 | * @param $time beginning timestamp |
| Index: branches/REL1_18/extensions/WikimediaIncubator/IncubatorTest.php |
| — | — | @@ -654,7 +654,7 @@ |
| 655 | 655 | static function fnTestWikiLogo( &$out ) { |
| 656 | 656 | $setLogo = self::shouldWeSetCustomLogo( $out->getTitle() ); |
| 657 | 657 | if( !$setLogo ) { |
| 658 | | - return false; |
| | 658 | + return true; |
| 659 | 659 | } |
| 660 | 660 | global $wgLogo; |
| 661 | 661 | $prefixForPageTitle = str_replace( '/', '-', strtolower( $setLogo['prefix'] ) ); |
| — | — | @@ -671,7 +671,7 @@ |
| 672 | 672 | $wgLogo = $thumb->getUrl(); |
| 673 | 673 | return true; |
| 674 | 674 | } |
| 675 | | - return false; |
| | 675 | + return true; |
| 676 | 676 | } |
| 677 | 677 | # Use MediaWiki:Incubator-logo-wx-xx(x) |
| 678 | 678 | $thumb = $file->transform( array( 'width' => 135, 'height' => 135 ) ); |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 679 | 679 | Merged /trunk/extensions:r104621,104867,107043,107120,107337 |