X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2FReplacementArray.php;h=b6faa3786d18eff94819fc6f9e6de30ce0f0e3ae;hb=b1ef4a066aa21858d2fccf3982bfcdbe641b7f92;hp=7fdb309383bd4e7f8e31edf9140487a3e488f042;hpb=1274a261c3970688569ce20d1d45571abae56344;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/ReplacementArray.php b/includes/libs/ReplacementArray.php
index 7fdb309383..b6faa3786d 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -76,7 +76,7 @@ class ReplacementArray {
 	 * @param array $data
 	 */
 	public function mergeArray( $data ) {
-		$this->data = array_merge( $this->data, $data );
+		$this->data = $data + $this->data;
 		$this->fss = false;
 	}
 
@@ -84,7 +84,7 @@ class ReplacementArray {
 	 * @param ReplacementArray $other
 	 */
 	public function merge( ReplacementArray $other ) {
-		$this->data = array_merge( $this->data, $other->data );
+		$this->data = $other->data + $this->data;
 		$this->fss = false;
 	}
 
@@ -111,7 +111,10 @@ class ReplacementArray {
 	 * @return string
 	 */
 	public function replace( $subject ) {
-		if ( function_exists( 'fss_prep_replace' ) ) {
+		if (
+			function_exists( 'fss_prep_replace' )  &&
+			version_compare( PHP_VERSION, '5.5.0' ) < 0
+		) {
 			if ( $this->fss === false ) {
 				$this->fss = fss_prep_replace( $this->data );
 			}