mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-43355_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-12-18 10:52:41 +13:00
commit 2df83c2ea8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/testing/classes/util.php
View File

@ -644,18 +644,23 @@ abstract class testing_util {
return null;
}
$ref = file_get_contents("$CFG->dirroot/.git/HEAD");
if ($ref === false) {
$headcontent = file_get_contents("$CFG->dirroot/.git/HEAD");
if ($headcontent === false) {
return null;
}
$ref = trim($ref);
$headcontent = trim($headcontent);
if (strpos($ref, 'ref: ') !== 0) {
// If it is pointing to a hash we return it directly.
if (strlen($headcontent) === 40) {
return $headcontent;
}
if (strpos($headcontent, 'ref: ') !== 0) {
return null;
}
$ref = substr($ref, 5);
$ref = substr($headcontent, 5);
if (!file_exists("$CFG->dirroot/.git/$ref")) {
return null;