| Index: branches/wmf/1.18wmf1/includes/filerepo/File.php |
| — | — | @@ -674,7 +674,7 @@ |
| 675 | 675 | // Get the descriptionUrl to embed it as comment into the thumbnail. Bug 19791. |
| 676 | 676 | $descriptionUrl = $this->getDescriptionUrl(); |
| 677 | 677 | if ( $descriptionUrl ) { |
| 678 | | - $params['descriptionUrl'] = $wgServer . $descriptionUrl; |
| | 678 | + $params['descriptionUrl'] = wfExpandUrl( $descriptionUrl, PROTO_CANONICAL ); |
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | $script = $this->getTransformScript(); |
| Property changes on: branches/wmf/1.18wmf1/includes/filerepo/File.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 682 | 682 | Merged /trunk/phase3/includes/filerepo/File.php:r98990,99349,100239,100242 |
| Property changes on: branches/wmf/1.18wmf1/includes/EditPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 683 | 683 | Merged /trunk/phase3/includes/EditPage.php:r99349,100239,100242 |
| Index: branches/wmf/1.18wmf1/includes/api/ApiExpandTemplates.php |
| — | — | @@ -90,7 +90,10 @@ |
| 91 | 91 | 'title' => array( |
| 92 | 92 | ApiBase::PARAM_DFLT => 'API', |
| 93 | 93 | ), |
| 94 | | - 'text' => null, |
| | 94 | + 'text' => array( |
| | 95 | + ApiBase::PARAM_TYPE => 'string', |
| | 96 | + ApiBase::PARAM_REQUIRED => true, |
| | 97 | + ), |
| 95 | 98 | 'generatexml' => false, |
| 96 | 99 | 'includecomments' => false, |
| 97 | 100 | ); |
| Property changes on: branches/wmf/1.18wmf1/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 98 | 101 | Merged /trunk/phase3/includes/api:r93977,98990,99349,100239,100242 |
| Index: branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderUserGroupsModule.php |
| — | — | @@ -33,15 +33,14 @@ |
| 34 | 34 | protected function getPages( ResourceLoaderContext $context ) { |
| 35 | 35 | if ( $context->getUser() ) { |
| 36 | 36 | $user = User::newFromName( $context->getUser() ); |
| 37 | | - if( $user instanceof User ){ |
| | 37 | + if ( $user instanceof User ) { |
| 38 | 38 | $pages = array(); |
| 39 | | - foreach( $user->getEffectiveGroups() as $group ){ |
| 40 | | - if( in_array( $group, array( '*', 'user' ) ) ){ |
| | 39 | + foreach( $user->getEffectiveGroups() as $group ) { |
| | 40 | + if ( in_array( $group, array( '*', 'user' ) ) ) { |
| 41 | 41 | continue; |
| 42 | 42 | } |
| 43 | | - $g = ucfirst( $group ); |
| 44 | | - $pages["MediaWiki:Group-$g.js"] = array( 'type' => 'script' ); |
| 45 | | - $pages["MediaWiki:Group-$g.css"] = array( 'type' => 'style' ); |
| | 43 | + $pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' ); |
| | 44 | + $pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' ); |
| 46 | 45 | } |
| 47 | 46 | return $pages; |
| 48 | 47 | } |
| Property changes on: branches/wmf/1.18wmf1/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 48 | Merged /trunk/phase3/includes/Title.php:r99349,100239,100242 |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 50 | 49 | Merged /trunk/phase3/includes:r93977,98990,99349,100239,100242 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 51 | 50 | Merged /trunk/phase3:r93977,98990,99349,100239,100242 |