diff --git a/.travis.yml b/.travis.yml index 7fba458b..06edbd3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ matrix: env: DB=MYSQL CORE_RELEASE=3.1 - php: 5.5 env: DB=MYSQL CORE_RELEASE=3.1 - allow_failures: - - php: 5.5 - env: DB=MYSQL CORE_RELEASE=3.1 before_script: - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support @@ -40,4 +37,4 @@ branches: notifications: irc: channels: - - "irc.freenode.org#silverstripe" \ No newline at end of file + - "irc.freenode.org#silverstripe" diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php index 8f8e8afc..6d3f514f 100644 --- a/code/controllers/ContentController.php +++ b/code/controllers/ContentController.php @@ -24,7 +24,8 @@ class ContentController extends Controller { private static $allowed_actions = array( 'successfullyinstalled', - 'deleteinstallfiles' // secured through custom code + 'deleteinstallfiles', // secured through custom code + 'LoginForm' ); /**