Merge remote-tracking branch 'origin/3.0' into 3.1

This commit is contained in:
Ingo Schommer 2012-12-14 10:55:51 +01:00
commit a8478d2e46
2 changed files with 9 additions and 1 deletions

View File

@ -95,7 +95,7 @@ JS
// Don't filter list when a detail view is requested, // Don't filter list when a detail view is requested,
// to avoid edge cases where the filtered list wouldn't contain the requested // to avoid edge cases where the filtered list wouldn't contain the requested
// record due to faulty session state (current folder not always encoded in URL, see #7408). // record due to faulty session state (current folder not always encoded in URL, see #7408).
if(!$folder->ID && ($this->request->param('ID') == 'field')) { if(!$folder->ID && $this->request->requestVar('ID') === null && ($this->request->param('ID') == 'field')) {
return $list; return $list;
} }

View File

@ -4,6 +4,14 @@
BUILD_DIR=$1 BUILD_DIR=$1
# Environment info
echo "# Environment info"
echo " - `php --version`"
echo " - `mysql --version`"
echo " - `pg_config --version`"
echo " - SQLite3 `sqlite3 -version`"
echo ""
# Fetch all dependencies # Fetch all dependencies
# TODO Replace with different composer.json variations # TODO Replace with different composer.json variations