@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace SilverStripe\Subsites\Extensions; |
4 | 4 | |
5 | 5 | use SilverStripe\Assets\Folder; |
6 | -use SilverStripe\Control\Session; |
|
7 | 6 | use SilverStripe\Forms\DropdownField; |
8 | 7 | use SilverStripe\Forms\FieldList; |
9 | 8 | use SilverStripe\Forms\LiteralField; |
@@ -202,7 +202,7 @@ |
||
202 | 202 | * Helper for testing if the subsite should be adjusted. |
203 | 203 | * @param $adminClass |
204 | 204 | * @param $recordSubsiteID |
205 | - * @param $currentSubsiteID |
|
205 | + * @param integer|null $currentSubsiteID |
|
206 | 206 | * @return bool |
207 | 207 | */ |
208 | 208 | public function shouldChangeSubsite($adminClass, $recordSubsiteID, $currentSubsiteID) |
@@ -6,11 +6,9 @@ |
||
6 | 6 | use SilverStripe\Admin\LeftAndMainExtension; |
7 | 7 | use SilverStripe\CMS\Model\SiteTree; |
8 | 8 | use SilverStripe\Control\Controller; |
9 | -use SilverStripe\Control\Session; |
|
10 | 9 | use SilverStripe\Core\Config\Config; |
11 | 10 | use SilverStripe\Core\Convert; |
12 | 11 | use SilverStripe\Core\Manifest\ModuleLoader; |
13 | -use SilverStripe\Forms\FieldList; |
|
14 | 12 | use SilverStripe\Forms\HiddenField; |
15 | 13 | use SilverStripe\ORM\ArrayList; |
16 | 14 | use SilverStripe\ORM\DataObject; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Admin\CMSMenu; |
6 | 6 | use SilverStripe\CMS\Model\SiteTree; |
7 | -use SilverStripe\Control\Controller; |
|
8 | 7 | use SilverStripe\Control\Director; |
9 | 8 | use SilverStripe\Control\Session; |
10 | 9 | use SilverStripe\Core\Convert; |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use SilverStripe\ErrorPage\ErrorPage; |
9 | 9 | use SilverStripe\CMS\Model\SiteTree; |
10 | 10 | use SilverStripe\Control\Director; |
11 | -use SilverStripe\Control\Session; |
|
12 | 11 | use SilverStripe\Core\Config\Config; |
13 | 12 | use SilverStripe\Core\Convert; |
14 | 13 | use SilverStripe\Forms\FieldList; |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace SilverStripe\Subsites\Tests; |
4 | 4 | |
5 | 5 | use SilverStripe\CMS\Controllers\CMSPageEditController; |
6 | -use SilverStripe\Control\Session; |
|
7 | 6 | use SilverStripe\Core\Config\Config; |
8 | 7 | use SilverStripe\Dev\FunctionalTest; |
9 | -use SilverStripe\Security\Member; |
|
10 | 8 | use SilverStripe\Subsites\Controller\SubsiteXHRController; |
11 | 9 | use SilverStripe\Subsites\Model\Subsite; |
12 | 10 | use SilverStripe\Subsites\State\SubsiteState; |