X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMath.php;h=8cf9b8d897709a6f072dbe320beacfef2a474fcb;hb=30a062321afb63a2a3dfc1a67a7c1e5cbd70e369;hp=ea9ff58ac584105e5b098112d20903c86b460386;hpb=251527d2c1f916268323d57d572f1599a026c54c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Math.php b/includes/Math.php
index ea9ff58ac5..8cf9b8d897 100644
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -34,7 +34,6 @@ class MathRenderer {
 	function render() {
 		global $wgTmpDirectory, $wgInputEncoding;
 		global $wgTexvc, $wgMathCheckFiles, $wgTexvcBackgroundColor;
-		$fname = 'MathRenderer::render';
 
 		if( $this->mode == MW_MATH_SOURCE ) {
 			# No need to render or parse anything more!
@@ -104,14 +103,14 @@ class MathRenderer {
 				} else {
 					$this->conservativeness = 0;
 				}
-				$this->mathml = NULL;
+				$this->mathml = null;
 			} else if ($retval == 'X') {
-				$this->html = NULL;
+				$this->html = null;
 				$this->mathml = substr ($contents, 33);
 				$this->conservativeness = 0;
 			} else if ($retval == '+') {
-				$this->html = NULL;
-				$this->mathml = NULL;
+				$this->html = null;
+				$this->mathml = null;
 				$this->conservativeness = 0;
 			} else {
 				$errbit = htmlspecialchars( substr($contents, 1) );
@@ -179,7 +178,7 @@ class MathRenderer {
 					'math_html_conservativeness' => $this->conservativeness,
 					'math_html' => $this->html,
 					'math_mathml' => $this->mathml,
-				  ), $fname
+				  ), __METHOD__
 				);
 			}
 			
@@ -204,14 +203,13 @@ class MathRenderer {
 
 	function _recall() {
 		global $wgMathDirectory, $wgMathCheckFiles;
-		$fname = 'MathRenderer::_recall';
 
 		$this->md5 = md5( $this->tex );
 		$dbr = wfGetDB( DB_SLAVE );
 		$rpage = $dbr->selectRow( 'math',
 			array( 'math_outputhash','math_html_conservativeness','math_html','math_mathml' ),
 			array( 'math_inputhash' => $dbr->encodeBlob(pack("H32", $this->md5))), # Binary packed, not hex
-			$fname
+			__METHOD__
 		);
 
 		if( $rpage !== false ) {