From: Domas Mituzas <midom@users.mediawiki.org>
Date: Mon, 29 May 2006 05:49:03 +0000 (+0000)
Subject: MessageCachePHP: throw out stupid RE, use simple str_replace's
X-Git-Tag: 1.31.0-rc.0~56980
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=00cb0d116b2f75478b2d9c5989d0742a60498a1c;p=lhc%2Fweb%2Fwiklou.git

MessageCachePHP: throw out stupid RE, use simple str_replace's
---

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 35ea4d53d5..a9fa1a445a 100644
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -148,16 +148,22 @@ class MessageCache {
 		$file = fopen( $filename.'.tmp', 'w');
 		fwrite($file,"<?php\n//$hash\n\n \$this->mCache = array(");
 		
-		$re="/(?<!\\\\)'/";
 		foreach ($array as $key => $message) {
-			fwrite($file, "'". preg_replace($re, "\'", $key).
-				"' => '" . preg_replace( $re, "\'", $message) . "',\n");
+			fwrite($file, "'". $this->escapeForScript($key).
+				"' => '" . $this->escapeForScript($message). 
+				"',\n");
 		}
 		fwrite($file,");\n?>");
 		fclose($file);
 		rename($filename.'.tmp',$filename);
 	}
 
+	function escapeForScript($string) {
+		$string = str_replace( '\\', '\\\\', $string );
+		$string = str_replace( '\'', '\\\'', $string );
+		return $string;
+	}
+
 	/**
 	 * Loads messages either from memcached or the database, if not disabled
 	 * On error, quietly switches to a fallback mode