Permalink
Browse files

Merge branch 'MOODLE_23_STABLE' into install_23_STABLE

  • Loading branch information...
2 parents ca2e480 + fadb971 commit 22c1afc8f9e13d88bd1889d69c188156a12080df AMOS bot committed Sep 6, 2013
View
@@ -95,6 +95,9 @@ function min_fix_utf8($value) {
error_reporting($olderror ^ E_NOTICE);
}
+ // No null bytes expected in our data, so let's remove it.
+ $value = str_replace("\0", '', $value);
+
static $buggyiconv = null;
if ($buggyiconv === null) {
$buggyiconv = (!function_exists('iconv') or iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'') !== '100€');
@@ -639,6 +639,7 @@ protected function emulate_bound_params($sql, array $params=null) {
} else {
$param = str_replace("'", "''", $param);
+ $param = str_replace("\0", "", $param);
$return .= "N'$param'";
}
@@ -719,6 +719,7 @@ protected function emulate_bound_params($sql, array $params = null) {
$return .= $param;
} else {
$param = str_replace("'", "''", $param);
+ $param = str_replace("\0", "", $param);
$return .= "N'$param'";
}
View
@@ -1158,6 +1158,8 @@ function fix_utf8($value) {
// shortcut
return $value;
}
+ // No null bytes expected in our data, so let's remove it.
+ $value = str_replace("\0", '', $value);
// Lower error reporting because glibc throws bogus notices.
$olderror = error_reporting();
@@ -44,7 +44,7 @@ class core_configonlylib_testcase extends advanced_testcase {
*/
public function test_min_fix_utf8() {
$this->assertSame('abc', min_fix_utf8('abc'));
- $this->assertSame("žlutý koníček přeskočil potůček \n\t\r\0", min_fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
+ $this->assertSame("žlutý koníček přeskočil potůček \n\t\r", min_fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
$this->assertSame('', min_fix_utf8('a'.chr(130).'š'), 'This fails with buggy iconv() when mbstring extenstion is not available as fallback.');
}
@@ -449,7 +449,7 @@ function test_fix_utf8() {
$this->assertEquals($object, fix_utf8($object));
// valid utf8 string
- $this->assertSame("žlutý koníček přeskočil potůček \n\t\r\0", fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
+ $this->assertSame("žlutý koníček přeskočil potůček \n\t\r", fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
// invalid utf8 string
$this->assertSame('', fix_utf8('a'.chr(130).'š'), 'This fails with buggy iconv() when mbstring extenstion is not available as fallback.');
View
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2012062508.06; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2012062508.07; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
-$release = '2.3.8+ (Build: 20130815)'; // Human-friendly version name
+$release = '2.3.8+ (Build: 20130905)'; // Human-friendly version name
$branch = '23'; // this version's branch
$maturity = MATURITY_STABLE; // this version's maturity level

0 comments on commit 22c1afc

Please sign in to comment.