From e848bf11536b05a043767e9b5a37df33746034a6 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Fri, 22 Mar 2013 16:08:07 +0100
Subject: [PATCH] MDL-37033 environment: add 2.5 brach details

---
 admin/environment.xml | 116 ++++++++++++++++++++++++++++++++++++++++++
 lang/en/admin.php     |   1 +
 2 files changed, 117 insertions(+)

diff --git a/admin/environment.xml b/admin/environment.xml
index 584a9b0e617..3b988197878 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -776,4 +776,120 @@
       </PHP_SETTING>
     </PHP_SETTINGS>
   </MOODLE>
+  <MOODLE version="2.5" requires="2.2">
+      <UNICODE level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unicoderequired" />
+        </FEEDBACK>
+      </UNICODE>
+      <DATABASE level="required">
+        <VENDOR name="mysql" version="5.1.33" />
+        <VENDOR name="postgres" version="8.3" />
+        <VENDOR name="mssql" version="9.0" />
+        <VENDOR name="odbc_mssql" version="9.0" />
+        <VENDOR name="mssql_n" version="9.0" />
+        <VENDOR name="oracle" version="10.2" />
+        <VENDOR name="sqlite" version="2.0" />
+      </DATABASE>
+      <PHP version="5.3.3" level="required">
+      </PHP>
+      <PCREUNICODE level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="pcreunicodewarning" />
+        </FEEDBACK>
+      </PCREUNICODE>
+      <PHP_EXTENSIONS>
+        <PHP_EXTENSION name="iconv" level="required">
+          <FEEDBACK>
+            <ON_CHECK message="iconvrequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="mbstring" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="mbstringrecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="curl" level="required">
+          <FEEDBACK>
+            <ON_CHECK message="curlrequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="openssl" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="opensslrecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="tokenizer" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="tokenizerrecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="xmlrpc" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="xmlrpcrecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="soap" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="soaprecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="ctype" level="required">
+          <FEEDBACK>
+            <ON_ERROR message="ctyperequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="zip" level="required">
+          <FEEDBACK>
+            <ON_ERROR message="ziprequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="gd" level="required">
+          <FEEDBACK>
+            <ON_ERROR message="gdrequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="simplexml" level="required">
+          <FEEDBACK>
+            <ON_CHECK message="simplexmlrequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="spl" level="required">
+          <FEEDBACK>
+            <ON_CHECK message="splrequired" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="pcre" level="required">
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="dom" level="required">
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="xml" level="required">
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="intl" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="intlrecommended" />
+          </FEEDBACK>
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="json" level="required">
+        </PHP_EXTENSION>
+        <PHP_EXTENSION name="hash" level="required"/>
+      </PHP_EXTENSIONS>
+      <PHP_SETTINGS>
+        <PHP_SETTING name="memory_limit" value="40M" level="required">
+          <FEEDBACK>
+            <ON_ERROR message="settingmemorylimit" />
+          </FEEDBACK>
+        </PHP_SETTING>
+        <PHP_SETTING name="safe_mode" value="0" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="settingsafemode" />
+          </FEEDBACK>
+        </PHP_SETTING>
+        <PHP_SETTING name="file_uploads" value="1" level="optional">
+          <FEEDBACK>
+            <ON_CHECK message="settingfileuploads" />
+          </FEEDBACK>
+        </PHP_SETTING>
+      </PHP_SETTINGS>
+    </MOODLE>
 </COMPATIBILITY_MATRIX>
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 24cb2dcc904..5bbb0bcf11a 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -537,6 +537,7 @@ $string['frontpageroles'] = 'Front page roles';
 $string['frontpagesettings'] = 'Front page settings';
 $string['fullnamedisplay'] = 'Full name format';
 $string['gdrecommended'] = 'GD extension is used for conversion of images, some features such as user profile images will not be available if missing.';
+$string['gdrequired'] = 'The GD extension is now required by Moodle for image conversion.';
 $string['gdversion'] = 'GD version';
 $string['generalsettings'] = 'General settings';
 $string['geoipfile'] = 'GeoIP city data file';