From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Mon, 20 Oct 2014 08:26:49 +0000 (+0200)
Subject: Fix incorrect replacement inside regular expression
X-Git-Tag: 1.31.0-rc.0~13568
X-Git-Url: http://git.cyclocoop.org/%27%40script%40/ecrire/?a=commitdiff_plain;h=d50b4371a503e9281a2e82a0851ccc6de1ebd266;p=lhc%2Fweb%2Fwiklou.git

Fix incorrect replacement inside regular expression

Fix for Id3aa87cfa0 (2537ca2).

The "$" is for the end of the string, not for a variable.

Change-Id: I2d262582644b903992dc621079ea5a6a04d7af70
---

diff --git a/maintenance/eval.php b/maintenance/eval.php
index ac4cb1a4ef..25ecc09980 100644
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -65,7 +65,7 @@ if ( $__useReadline ) {
 
 $__e = null; // PHP exception
 while ( ( $__line = Maintenance::readconsole() ) !== false ) {
-	if ( $__e && !preg_match( '/^(exit|die);?$__/', $__line ) ) {
+	if ( $__e && !preg_match( '/^(exit|die);?$/', $__line ) ) {
 		// Internal state may be corrupted or fatals may occur later due
 		// to some object not being set. Don't drop out of eval in case
 		// lines were being pasted in (which would then get dumped to the shell).