From 16b234384ab785a20f5b4cf3f33275ca3c7b44ac Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 25 Jul 2011 22:09:05 +0000 Subject: [PATCH] More wfMkdirParents() __METHOD__ additions --- Math.body.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Math.body.php b/Math.body.php index a589ba869..0715ef7a5 100644 --- a/Math.body.php +++ b/Math.body.php @@ -53,7 +53,7 @@ class MathRenderer { if( $wgMathCheckFiles ) { # Ensure that the temp and output directories are available before continuing... if( !file_exists( $wgTmpDirectory ) ) { - if( !wfMkdirParents( $wgTmpDirectory ) ) { + if( !wfMkdirParents( $wgTmpDirectory, null, __METHOD__ ) ) { return $this->_error( 'math_bad_tmpdir' ); } } elseif( !is_dir( $wgTmpDirectory ) || !is_writable( $wgTmpDirectory ) ) { @@ -160,7 +160,7 @@ class MathRenderer { $hashpath = $this->_getHashPath(); if( !file_exists( $hashpath ) ) { wfSuppressWarnings(); - $ret = wfMkdirParents( $hashpath, 0755 ); + $ret = wfMkdirParents( $hashpath, 0755, __METHOD__ ); wfRestoreWarnings(); if( !$ret ) { return $this->_error( 'math_bad_output' ); @@ -193,7 +193,7 @@ class MathRenderer { __METHOD__ ); } - + // If we're replacing an older version of the image, make sure it's current. global $wgUseSquid; if ( $wgUseSquid ) { @@ -240,12 +240,12 @@ class MathRenderer { $this->mathml = $rpage->math_mathml; $filename = $this->_getHashPath() . "/{$this->hash}.png"; - + if( !$wgMathCheckFiles ) { // Short-circuit the file existence & migration checks return true; } - + if( file_exists( $filename ) ) { if( filesize( $filename ) == 0 ) { // Some horrible error corrupted stuff :( @@ -262,7 +262,7 @@ class MathRenderer { if( !file_exists( $hashpath ) ) { wfSuppressWarnings(); - $ret = wfMkdirParents( $hashpath, 0755 ); + $ret = wfMkdirParents( $hashpath, 0755, __METHOD__ ); wfRestoreWarnings(); if( !$ret ) { return false; @@ -341,14 +341,14 @@ class MathRenderer { $dir = $this->_getHashSubPath(); return "$wgMathPath/$dir/{$this->hash}.png"; } - + function _getHashPath() { global $wgMathDirectory; $path = $wgMathDirectory . '/' . $this->_getHashSubPath(); wfDebug( "TeX: getHashPath, hash is: $this->hash, path is: $path\n" ); return $path; } - + function _getHashSubPath() { return substr( $this->hash, 0, 1) . '/' . substr( $this->hash, 1, 1 )