jenkins-bot has submitted this change and it was merged. Change subject: Add missing and fix wrong @license tags ......................................................................
Add missing and fix wrong @license tags Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f --- M includes/ApiQueryPageImages.php M includes/PageImages.php M maintenance/initImageData.php M tests/phpunit/ApiQueryPageImagesTest.php M tests/phpunit/PageImagesTest.php 5 files changed, 31 insertions(+), 3 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php index 12b8c49..714a060 100644 --- a/includes/ApiQueryPageImages.php +++ b/includes/ApiQueryPageImages.php @@ -1,9 +1,18 @@ <?php + /** * Expose image information for a page via a new prop=pageimages API. - * See https://www.mediawiki.org/wiki/Extension:PageImages#API + * + * @see https://www.mediawiki.org/wiki/Extension:PageImages#API + * + * @license WTFPL 2.0 + * @author MaxSem + * @author Ryan Kaldari + * @author Yuvi Panda + * @author Sam Smith */ class ApiQueryPageImages extends ApiQueryBase { + public function __construct( $query, $moduleName ) { parent::__construct( $query, $moduleName, 'pi' ); } diff --git a/includes/PageImages.php b/includes/PageImages.php index 4e16f52..be76aad 100644 --- a/includes/PageImages.php +++ b/includes/PageImages.php @@ -1,6 +1,13 @@ <?php +/** + * @license WTFPL 2.0 + * @author MaxSem + * @author Brad Jorsch + * @author Thiemo Mättig + */ class PageImages { + /** * Page property used to store the page image information */ @@ -20,10 +27,13 @@ array( 'pp_page' => $title->getArticleID(), 'pp_propname' => self::PROP_NAME ), __METHOD__ ); + $file = false; + if ( $name ) { $file = wfFindFile( $name ); } + return $file; } @@ -280,6 +290,7 @@ * * @param int[] $pageIds * @param int $size + * * @return array[] */ private static function getImages( array $pageIds, $size = 0 ) { @@ -290,12 +301,15 @@ 'pageids' => implode( '|', $pageIds ), 'pilimit' => 'max', ); + if ( $size ) { $request['piprop'] = 'thumbnail'; $request['pithumbsize'] = $size; } + $api = new ApiMain( new FauxRequest( $request ) ); $api->execute(); + if ( defined( 'ApiResult::META_CONTENT' ) ) { return (array)$api->getResult()->getResultData( array( 'query', 'pages' ), array( 'Strip' => 'base' ) ); diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php index a0882dc..5776dd4 100644 --- a/maintenance/initImageData.php +++ b/maintenance/initImageData.php @@ -6,6 +6,10 @@ } require_once( "$IP/maintenance/Maintenance.php" ); +/** + * @license WTFPL 2.0 + * @author MaxSem + */ class InitImageData extends Maintenance { const BATCH_SIZE = 100; diff --git a/tests/phpunit/ApiQueryPageImagesTest.php b/tests/phpunit/ApiQueryPageImagesTest.php index e2434e1..b2fbfe9 100644 --- a/tests/phpunit/ApiQueryPageImagesTest.php +++ b/tests/phpunit/ApiQueryPageImagesTest.php @@ -45,7 +45,8 @@ * * @group PageImages * - * @licence GNU GPL v2+ + * @license WTFPL 2.0 + * @author Sam Smith * @author Thiemo Mättig */ class ApiQueryPageImagesTest extends PHPUnit_Framework_TestCase { diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php index e2b8df6..6efb247 100644 --- a/tests/phpunit/PageImagesTest.php +++ b/tests/phpunit/PageImagesTest.php @@ -13,7 +13,7 @@ * @group PageImages * @group Database * - * @licence GNU GPL v2+ + * @license WTFPL 2.0 * @author Thiemo Mättig */ class PageImagesTest extends MediaWikiTestCase { -- To view, visit https://gerrit.wikimedia.org/r/253327 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageImages Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
