Samwilson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379197 )

Change subject: Fix up DOMDOcument::loadHTML() usage
......................................................................

Fix up DOMDOcument::loadHTML() usage

This was failing to create the DOMXPath object, because $doc was
just the boolean returned from loadHTML.

Change-Id: I21556658c31a5d2667c30dda677d66f36128d8cb
---
M RandomImage.class.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomImage 
refs/changes/97/379197/1

diff --git a/RandomImage.class.php b/RandomImage.class.php
index ec81113..d99c8b4 100644
--- a/RandomImage.class.php
+++ b/RandomImage.class.php
@@ -118,12 +118,12 @@
         */
        protected function removeMagnifier( $html ) {
                $dom = new DOMDocument();
-               $doc = $dom->loadHTML( $html );
-               $xpath = new DOMXPath( $doc );
+               $dom->loadHTML( $html );
+               $xpath = new DOMXPath( $dom );
                foreach ( $xpath->query( '//div[@class="magnify"]' ) as $mag ) {
                        $mag->parentNode->removeChild( $mag );
                }
-               return preg_replace( '!<\?xml[^?]*\?>!', '', $doc->saveXml() );
+               return preg_replace( '!<\?xml[^?]*\?>!', '', $dom->saveXml() );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/379197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21556658c31a5d2667c30dda677d66f36128d8cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomImage
Gerrit-Branch: master
Gerrit-Owner: Samwilson <s...@samwilson.id.au>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to