diff --git a/.travis.yml b/.travis.yml index 987a42ed..71f63bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: env: global: - - CORE_RELEASE=3.5 + - CORE_RELEASE=3 matrix: include: diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index bce918de..cbf7be7e 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -422,7 +422,7 @@ JS $actions = new FieldList( FormAction::create('doSearch', _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter')) ->addExtraClass('ss-ui-action-constructive'), - Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset')) + SS_Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset')) ); $form = new Form($this, 'filter', $fields, $actions); diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index a67d020d..2c25e083 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -368,7 +368,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $actions = new FieldList( FormAction::create('doSearch', _t('CMSMain_left_ss.APPLY_FILTER', 'Search')) ->addExtraClass('ss-ui-action-constructive'), - Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.CLEAR_FILTER', 'Clear')) + SS_Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.CLEAR_FILTER', 'Clear')) ); // Use