Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove a workaround for PHP 5.3.0 in JLanguage.

This raises the minimum requirement to 5.3.1.
  • Loading branch information...
commit 23b01700c290f19acbf2aa581056d7c62e04e82d 1 parent 4686e89
Rouven Weßling authored
2  README.markdown
Source Rendered
@@ -16,7 +16,7 @@ Requirements
16 16
 ------------
17 17
 
18 18
 * PHP 5.2.4+ for Platform versions 11.x
19  
-* PHP 5.3+ for Platform versions 12.x  
  19
+* PHP 5.3.1+ for Platform versions 12.x  
20 20
 
21 21
 
22 22
 Installation
23  libraries/joomla/language/language.php
@@ -800,31 +800,14 @@ protected function loadLanguage($filename, $extension = 'unknown')
800 800
 	 */
801 801
 	protected function parse($filename)
802 802
 	{
803  
-		$version = phpversion();
804  
-
805 803
 		// Capture hidden PHP errors from the parsing.
806 804
 		$php_errormsg = null;
807 805
 		$track_errors = ini_get('track_errors');
808 806
 		ini_set('track_errors', true);
809 807
 
810  
-		if ($version >= '5.3.1')
811  
-		{
812  
-			$contents = file_get_contents($filename);
813  
-			$contents = str_replace('_QQ_', '"\""', $contents);
814  
-			$strings = @parse_ini_string($contents);
815  
-		}
816  
-		else
817  
-		{
818  
-			$strings = @parse_ini_file($filename);
819  
-
820  
-			if ($version == '5.3.0' && is_array($strings))
821  
-			{
822  
-				foreach ($strings as $key => $string)
823  
-				{
824  
-					$strings[$key] = str_replace('_QQ_', '"', $string);
825  
-				}
826  
-			}
827  
-		}
  808
+		$contents = file_get_contents($filename);
  809
+		$contents = str_replace('_QQ_', '"\""', $contents);
  810
+		$strings = @parse_ini_string($contents);
828 811
 
829 812
 		// Restore error tracking to what it was before.
830 813
 		ini_set('track_errors', $track_errors);

0 notes on commit 23b0170

Please sign in to comment.
Something went wrong with that request. Please try again.