diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index e678a9cd..e5e9cd7a 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -95,7 +95,7 @@ JS // Don't filter list when a detail view is 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). - if(!$folder->ID && ($this->request->param('ID') == 'field')) { + if(!$folder->ID && $this->request->requestVar('ID') === null && ($this->request->param('ID') == 'field')) { return $list; } diff --git a/tests/travis/before_script b/tests/travis/before_script index a7ebb62f..94f244f8 100755 --- a/tests/travis/before_script +++ b/tests/travis/before_script @@ -4,6 +4,14 @@ 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 # TODO Replace with different composer.json variations