From: Alexandre Emsenhuber Date: Wed, 18 Mar 2009 19:25:29 +0000 (+0000) Subject: Changed ereg(i)_replace to preg_replace, the former is throwing E_DEPRECATED since... X-Git-Tag: 1.31.0-rc.0~42455 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=c53e76ad3466ff48c4f9e5c8f7b7769ee0375fb9;p=lhc%2Fweb%2Fwiklou.git Changed ereg(i)_replace to preg_replace, the former is throwing E_DEPRECATED since PHP 5.3 --- diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 67f9f698d5..664d66cb47 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -247,16 +247,16 @@ abstract class ApiBase { if ($this->getMain()->getShowVersions()) { $versions = $this->getVersion(); - $pattern = '(\$.*) ([0-9a-z_]+\.php) (.*\$)'; + $pattern = '/(\$.*) ([0-9a-z_]+\.php) (.*\$)/i'; $replacement = '\\0' . "\n " . 'http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/api/\\2'; if (is_array($versions)) { foreach ($versions as &$v) - $v = eregi_replace($pattern, $replacement, $v); + $v = preg_replace($pattern, $replacement, $v); $versions = implode("\n ", $versions); } else - $versions = eregi_replace($pattern, $replacement, $versions); + $versions = preg_replace($pattern, $replacement, $versions); $msg .= "Version:\n $versions\n"; } diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index df8c28e7df..79fe42fe6a 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -224,9 +224,9 @@ See complete documentation, or $text = preg_replace("#api\\.php\\?[^ \\()<\n\t]+#", '\\0', $text); if( $this->mHelp ) { // make strings inside * bold - $text = ereg_replace("\\*[^<>\n]+\\*", '\\0', $text); + $text = preg_replace("#\\*[^<>\n]+\\*#", '\\0', $text); // make strings inside $ italic - $text = ereg_replace("\\$[^<>\n]+\\$", '\\0', $text); + $text = preg_replace("#\\$[^<>\n]+\\$#", '\\0', $text); } /* Temporary fix for bad links in help messages. As a special case,