@@ -70,6 +70,9 @@ |
||
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | + /** |
|
74 | + * @param string $msg |
|
75 | + */ |
|
73 | 76 | public function log($msg) |
74 | 77 | { |
75 | 78 | echo $msg . "\n"; |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | * - Is in a group which has access to the subsite this page belongs to |
252 | 252 | * - Is in a group with edit permissions on the "main site" |
253 | 253 | * |
254 | - * @param null $member |
|
255 | - * @return bool |
|
254 | + * @param Member|null $member |
|
255 | + * @return false|null |
|
256 | 256 | */ |
257 | 257 | public function canEdit($member = null) |
258 | 258 | { |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | |
283 | 283 | /** |
284 | 284 | * @param null $member |
285 | - * @return bool |
|
285 | + * @return false|null |
|
286 | 286 | */ |
287 | 287 | public function canDelete($member = null) |
288 | 288 | { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | |
296 | 296 | /** |
297 | 297 | * @param null $member |
298 | - * @return bool |
|
298 | + * @return false|null |
|
299 | 299 | */ |
300 | 300 | public function canAddChildren($member = null) |
301 | 301 | { |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | |
309 | 309 | /** |
310 | 310 | * @param null $member |
311 | - * @return bool |
|
311 | + * @return false|null |
|
312 | 312 | */ |
313 | 313 | public function canPublish($member = null) |
314 | 314 | { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | |
449 | 449 | /** |
450 | 450 | * @param Member |
451 | - * @return boolean|null |
|
451 | + * @return false|null |
|
452 | 452 | */ |
453 | 453 | public function canCreate($member = null) |
454 | 454 | { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | |
6 | 6 | use SilverStripe\Control\Controller; |
7 | 7 | use SilverStripe\Control\HTTPRequest; |
8 | -use SilverStripe\Control\Session; |
|
9 | 8 | use SilverStripe\Forms\TreeDropdownField; |
10 | 9 | use SilverStripe\View\Requirements; |
11 | 10 |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * for example matching all subdomains on *.example.com with one subsite, |
205 | 205 | * and all subdomains on *.example.org on another. |
206 | 206 | * |
207 | - * @param $host string The host to find the subsite for. If not specified, $_SERVER['HTTP_HOST'] is used. |
|
207 | + * @param string $host string The host to find the subsite for. If not specified, $_SERVER['HTTP_HOST'] is used. |
|
208 | 208 | * @param bool $checkPermissions |
209 | 209 | * @return int Subsite ID |
210 | 210 | */ |
@@ -329,6 +329,10 @@ discard block |
||
329 | 329 | * |
330 | 330 | * @return ArrayList of {@link Subsite} instances. |
331 | 331 | */ |
332 | + |
|
333 | + /** |
|
334 | + * @param DataObject $member |
|
335 | + */ |
|
332 | 336 | public static function all_accessible_sites($includeMainSite = true, $mainSiteTitle = 'Main site', $member = null) |
333 | 337 | { |
334 | 338 | // Rationalise member arguments |
@@ -371,7 +375,7 @@ discard block |
||
371 | 375 | * @param $permCode array|string Either a single permission code or an array of permission codes. |
372 | 376 | * @param $includeMainSite bool If true, the main site will be included if appropriate. |
373 | 377 | * @param $mainSiteTitle string The label to give to the main site |
374 | - * @param $member int|Member The member attempting to access the sites |
|
378 | + * @param DataObject $member int|Member The member attempting to access the sites |
|
375 | 379 | * @return DataList|ArrayList of {@link Subsite} instances |
376 | 380 | */ |
377 | 381 | public static function accessible_sites( |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use SilverStripe\Assets\File; |
6 | 6 | use SilverStripe\Assets\Folder; |
7 | 7 | use SilverStripe\Forms\FieldList; |
8 | -use SilverStripe\Security\Member; |
|
9 | 8 | use SilverStripe\Subsites\Extensions\FileSubsites; |
10 | 9 | use SilverStripe\Subsites\Model\Subsite; |
11 | 10 |
@@ -303,6 +303,9 @@ |
||
303 | 303 | ); |
304 | 304 | } |
305 | 305 | |
306 | + /** |
|
307 | + * @param SubsitesVirtualPage $page |
|
308 | + */ |
|
306 | 309 | protected function fixVersionNumberCache($page) |
307 | 310 | { |
308 | 311 | $pages = func_get_args(); |