From 094039dbc84cc46d76934a786b7594a95b89e14e Mon Sep 17 00:00:00 2001 From: Simon Welsh Date: Sun, 14 Jul 2013 17:21:18 +1200 Subject: [PATCH 1/2] Remove PHP 5.5 from allowed failures --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b46af4d9..00c99aab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,6 @@ matrix: env: DB=MYSQL CORE_RELEASE=3.0 - php: 5.5 env: DB=MYSQL CORE_RELEASE=3.0 - allow_failures: - - php: 5.5 - env: DB=MYSQL CORE_RELEASE=3.0 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" From 3a3e8f2faab4e6a563fc35563b6908c1a2b70a7e Mon Sep 17 00:00:00 2001 From: Simon Welsh Date: Sun, 14 Jul 2013 17:21:59 +1200 Subject: [PATCH 2/2] Adds LoginForm as an allowed action Behaves as a form method defined on ContentController --- code/controllers/ContentController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php index 0eb8cc01..0ff261c5 100644 --- a/code/controllers/ContentController.php +++ b/code/controllers/ContentController.php @@ -24,7 +24,8 @@ class ContentController extends Controller { public static $allowed_actions = array( 'successfullyinstalled', - 'deleteinstallfiles' // secured through custom code + 'deleteinstallfiles', // secured through custom code + 'LoginForm' ); /**