Permalink
Browse files

Merge branch 'MOODLE_20_STABLE' into install_20_STABLE

  • Loading branch information...
2 parents 3c48745 + 1c84aa8 commit 335ded3169e0a70c66f7c6477851f65d54106187 AMOS bot committed Jun 26, 2012
Showing with 5 additions and 21 deletions.
  1. +4 −20 admin/environment.xml
  2. +1 −1 lib/filestorage/zip_packer.php
View
@@ -214,11 +214,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -335,11 +331,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -449,11 +441,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -563,11 +551,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <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" />
@@ -279,7 +279,7 @@ public function extract_to_storage($archivefile, $contextid, $component, $filear
global $CFG;
if (!is_string($archivefile)) {
- return $archivefile->extract_to_pathname($this, $contextid, $component, $filearea, $itemid, $pathbase, $userid);
+ return $archivefile->extract_to_storage($this, $contextid, $component, $filearea, $itemid, $pathbase, $userid);
}
check_dir_exists($CFG->dataroot.'/temp/zip');

0 comments on commit 335ded3

Please sign in to comment.