diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc index a2d5a833..c9a615ce 100644 --- a/includes/ingest.form.inc +++ b/includes/ingest.form.inc @@ -78,7 +78,7 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array if (empty($objects)) { $objects[] = islandora_ingest_form_prepare_new_object($configuration); } - // No need to persist the 'objects' within the configuration. + // No need to persist the objects within the configuration. unset($configuration['objects']); // Required for step hooks. $configuration['models'] = isset($configuration['models']) ? $configuration['models'] : array(); diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 7939215b..354e4d6b 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -11,12 +11,11 @@ cd islandora_tomcat export CATALINA_HOME='.' ./bin/startup.sh cd $HOME -pyrus channel-discover pear.drush.org -pyrus channel-discover pear.phpqatools.org -pyrus channel-discover pear.netpirates.net -pyrus install drush/drush -pyrus install pear/PHP_CodeSniffer -pyrus install pear.phpunit.de/phpcpd +pear channel-discover pear.phpqatools.org +pear channel-discover pear.netpirates.net +pear install pear/PHP_CodeSniffer +pear install pear.phpunit.de/phpcpd +sudo apt-get install -qq drush phpenv rehash drush dl --yes drupal cd drupal-*