Merge "Title: Refactor JS/CSS page handling to be more sane"

[lhc/web/wiklou.git] / includes / media / DjVuImage.php

diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index 5e8f8c8..adcac25 100644 (file)
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -40,8 +40,6 @@ class DjVuImage {
        const DJVUTXT_MEMORY_LIMIT = 300000;
 
        /**
-        * Constructor
-        *
         * @param string $filename The DjVu file name.
         */
        function __construct( $filename ) {
@@ -119,9 +117,9 @@ class DjVuImage {
        }
 
        function getInfo() {
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $file = fopen( $this->mFilename, 'rb' );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( $file === false ) {
                        wfDebug( __METHOD__ . ": missing or failed file read\n" );
 
@@ -277,9 +275,9 @@ class DjVuImage {
                                $reg = <<<EOR
                                        /\(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*"
                                        ((?>    # Text to match is composed of atoms of either:
-                                         \\\\. # - any escaped character
-                                         |     # - any character different from " and \
-                                         [^"\\\\]+
+                                               \\\\. # - any escaped character
+                                               |     # - any character different from " and \
+                                               [^"\\\\]+
                                        )*?)
                                        "\s*\)
                                        | # Or page can be empty ; in this case, djvutxt dumps ()