@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Filesystem\ImageManipulation; |
| 6 | 6 | use SilverStripe\Filesystem\Storage\AssetContainer; |
| 7 | 7 | use SilverStripe\Filesystem\Storage\AssetStore; |
| 8 | - |
|
| 9 | 8 | use Injector; |
| 10 | 9 | use AssetField; |
| 11 | 10 | use File; |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | /** |
| 253 | 253 | * Gets the combined configuration of all LeafAndMain subclasses required by the client app. |
| 254 | 254 | * |
| 255 | - * @return array |
|
| 255 | + * @return string |
|
| 256 | 256 | * |
| 257 | 257 | * WARNING: Experimental API |
| 258 | 258 | */ |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | * |
| 692 | 692 | * @param string $url |
| 693 | 693 | * @param int $code |
| 694 | - * @return HTTPResponse|string |
|
| 694 | + * @return string|null |
|
| 695 | 695 | */ |
| 696 | 696 | public function redirect($url, $code=302) { |
| 697 | 697 | if($this->getRequest()->isAjax()) { |
@@ -969,7 +969,7 @@ discard block |
||
| 969 | 969 | * {@link SSViewer::get_templates_by_class()} |
| 970 | 970 | * |
| 971 | 971 | * @param string $suffix |
| 972 | - * @return array |
|
| 972 | + * @return string |
|
| 973 | 973 | */ |
| 974 | 974 | public function getTemplatesWithSuffix($suffix) { |
| 975 | 975 | $templates = SSViewer::get_templates_by_class(get_class($this), $suffix, __CLASS__); |
@@ -2039,7 +2039,7 @@ discard block |
||
| 2039 | 2039 | } |
| 2040 | 2040 | |
| 2041 | 2041 | /** |
| 2042 | - * @return String |
|
| 2042 | + * @return DBField |
|
| 2043 | 2043 | */ |
| 2044 | 2044 | public function Locale() { |
| 2045 | 2045 | return DBField::create_field('Locale', i18n::get_locale()); |