Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-08-11 23:44:50 +02:00
commit b7759a1889
3 changed files with 18 additions and 12 deletions

View file

@ -3502,8 +3502,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
$key = $o->name;
break;
}
$val = $this->fetchMode == ADODB_FETCH_ASSOC ? $o->name : $i;
$this->bind[$key] = $val;
$this->bind[$key] = $i;
}
}

View file

@ -22,5 +22,9 @@ Added:
Our changes:
* Removed random seed initialization from lib/adodb/adodb.inc.php:177 (see 038f546 and MDL-41198).
* Added commit to fix associative fetch mode https://github.com/ADOdb/ADOdb/commit/97c3afacb3e4f98195908101bf3621e5cc847635
When upgrading ADODB to 5.20 or higher, check
whether that commit was included and if not
remove this item
skodak, iarenaza, moodler, stronk7