Accomodate both formatversion=2 and old-style API results (#33)

addwiki · Apr 11, 2017 · 94a091c · 94a091c
1 parent 48f7454
commit 94a091c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/MediawikiApi.php b/src/MediawikiApi.php
@@ -310,7 +310,12 @@ private function getUserAgent() {
 	private function logWarnings( $result ) {
 		if( is_array( $result ) && array_key_exists( 'warnings', $result ) ) {
 			foreach( $result['warnings'] as $module => $warningData ) {
-				$this->logger->log( LogLevel::WARNING, $module . ': ' . $warningData['*'], array( 'data' => $warningData ) );
+				// Accomodate both formatversion=2 and old-style API results
+				if( isset( $warningData['*'] ) ) {
+					$this->logger->log( LogLevel::WARNING, $module . ': ' . $warningData['*'], array( 'data' => $warningData ) );
+				} else {
+					$this->logger->log( LogLevel::WARNING, $module . ': ' . $warningData['warnings'], array( 'data' => $warningData ) );
+				}
 			}
 		}
 	}