tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93 from halkyon/e_strict_fixes

Browse Source 
E_STRICT compliance fixes for CMS module
This commit is contained in:
Sam Minnée 2012-04-11 16:30:46 -07:00
commit 117b8c3f97
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/ReportAdmin.php
View File

@ -108,8 +108,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
* Returns the Breadcrumbs for the ReportAdmin
* @return ArrayList
*/
public function Breadcrumbs() {
$items = parent::Breadcrumbs();
public function Breadcrumbs($unlinked = false) {
$items = parent::Breadcrumbs($unlinked);
// The root element should explicitly point to the root node.
// Uses session state for current record otherwise.

17
code/staticpublisher/StaticPublisher.php
View File

@ -26,7 +26,15 @@ abstract class StaticPublisher extends DataExtension {
abstract function publishPages($pages);
abstract function unpublishPages($pages);
static function set_static_publisher_theme($theme){
self::$static_publisher_theme=$theme;
}
static function static_publisher_theme(){
return self::$static_publisher_theme;
}
static function echo_progress() {
return (boolean)self::$echo_progress;
}
@ -144,13 +152,6 @@ abstract class StaticPublisher extends DataExtension {
return $urls;
}
function set_static_publisher_theme($theme){
self::$static_publisher_theme=$theme;
}
function static_publisher_theme(){
return self::$static_publisher_theme;
}
}

4
code/widgets/WidgetAreaEditor.php
View File

@ -61,7 +61,7 @@ class WidgetAreaEditor extends FormField {
return $this->form->getRecord()->getComponent($relationName)->ID;
}
function saveInto(DataObject $record) {
function saveInto(DataObjectInterface $record) {
$name = $this->name;
$idName = $name . "ID";
@ -139,4 +139,4 @@ class WidgetAreaEditor extends FormField {
}
}
}
}
}