Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395115 )
Change subject: Better undefined index protection
......................................................................
Better undefined index protection
* CollectionAPIResult::get has better error protection
then directly accessing $response
* A CollectionAPIResult may error, so check this before trying
to access information from it.
Bug: T182026
Change-Id: I0bbb8a00d010b8892cd12ec030c8358e42fd2e46
---
M Collection.body.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/15/395115/1
diff --git a/Collection.body.php b/Collection.body.php
index 6321fc7..452f41c 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -1054,7 +1054,7 @@
$api = CollectionRenderingAPI::instance( $writer );
$response = $api->render( $collection );
- if ( !$this->handleResult( $response ) ) {
+ if ( !$this->handleResult( $response ) || $response->isError()
) {
return;
}
@@ -1078,15 +1078,15 @@
$api = CollectionRenderingAPI::instance( $writer );
$response = $api->forceRender( $collectionID );
- if ( !$response ) {
+ if ( !$response || $response->isError() ) {
return;
}
$query = 'bookcmd=rendering'
. '&return_to=' . urlencode( $request->getVal(
'return_to', '' ) )
- . '&collection_id=' . urlencode(
$response->response['collection_id'] )
- . '&writer=' . urlencode( $response->response['writer']
);
- if ( isset( $response->response['is_cached'] ) &&
$response->response['is_cached'] ) {
+ . '&collection_id=' . urlencode( $response->get(
'collection_id' ) )
+ . '&writer=' . urlencode( $response->get( 'writer' ) );
+ if ( $response->get( 'is_cached' ) ) {
$query .= '&is_cached=1';
}
$this->getOutput()->redirect( SkinTemplate::makeSpecialUrl(
'Book', $query ) );
--
To view, visit https://gerrit.wikimedia.org/r/395115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bbb8a00d010b8892cd12ec030c8358e42fd2e46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
