tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fix deprecated and removed static accessor calls

Browse Source
This commit is contained in:
Hamish Friedlander 2011-12-22 15:31:56 +13:00
parent 9c2ebc3e5f
commit 4315e51358
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control/RequestHandler.php
View File

@ -214,13 +214,8 @@ class RequestHandler extends ViewableData {
* @return array|null * @return array|null
*/ */
public function allowedActions() { public function allowedActions() {
$actions = Object::combined_static(get_class($this), 'allowed_actions', 'RequestHandler');
$actions = Config::inst()->get(get_class($this), 'allowed_actions');
foreach($this->extension_instances as $extension) {
if($extensionActions = Object::get_static(get_class($extension), 'allowed_actions')) {
$actions = array_merge($actions, $extensionActions);
}
}
if($actions) { if($actions) {
// convert all keys and values to lowercase to // convert all keys and values to lowercase to

9
model/DataObject.php
View File

@ -1373,7 +1373,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return substr($remoteClass, $fieldPos + 1) . 'ID'; return substr($remoteClass, $fieldPos + 1) . 'ID';
} }
$remoteRelations = array_flip(Object::combined_static($remoteClass, 'has_one', 'DataObject')); $remoteRelations = array_flip(Config::inst()->get($remoteClass, 'has_one'));
// look for remote has_one joins on this class or any parent classes // look for remote has_one joins on this class or any parent classes
foreach(array_reverse(ClassInfo::ancestry($this)) as $class) { foreach(array_reverse(ClassInfo::ancestry($this)) as $class) {
@ -1460,7 +1460,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return string|array * @return string|array
*/ */
public function belongs_to($component = null, $classOnly = true) { public function belongs_to($component = null, $classOnly = true) {
$belongsTo = Object::combined_static($this->class, 'belongs_to', 'DataObject'); $belongsTo = $this->config()->belongs_to;
if($component) { if($component) {
if($belongsTo && array_key_exists($component, $belongsTo)) { if($belongsTo && array_key_exists($component, $belongsTo)) {
@ -1528,7 +1528,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return string|array * @return string|array
*/ */
public function has_many($component = null, $classOnly = true) { public function has_many($component = null, $classOnly = true) {
$hasMany = Object::combined_static($this->class, 'has_many', 'DataObject'); $hasMany = $this->config()->has_many;
if($component) { if($component) {
if($hasMany && array_key_exists($component, $hasMany)) { if($hasMany && array_key_exists($component, $hasMany)) {
@ -2755,7 +2755,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Only build the table if we've actually got fields // Only build the table if we've actually got fields
$fields = self::database_fields($this->class); $fields = self::database_fields($this->class);
$extensions = self::database_extensions($this->class); $extensions = self::database_extensions($this->class);
$indexes = $this->databaseIndexes(); $indexes = $this->databaseIndexes();
if($fields) { if($fields) {
@ -3074,6 +3074,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* This is a map from field names to field type. The field * This is a map from field names to field type. The field
* type should be a class that extends . * type should be a class that extends .
* @var array * @var array
* @config
*/ */
public static $db = null; public static $db = null;