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

ENH Speed up DataObject::get_by_id by checking if there is an ID at all

Browse Source
This commit is contained in:
Nicolaas / Sunn Side Up 2022-01-17 09:45:56 +13:00 committed by GitHub
parent d9aad6cd94
commit d1cac485b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ORM/DataObject.php
View File

@ -81,11 +81,11 @@ use stdClass;
* static $api_access = true; * static $api_access = true;
* *
* function canView($member = false) { * function canView($member = false) {
* if(!$member) $member = Security::getCurrentUser(); * if (!$member) $member = Security::getCurrentUser();
* return $member->inGroup('Subscribers'); * return $member->inGroup('Subscribers');
* } * }
* function canEdit($member = false) { * function canEdit($member = false) {
* if(!$member) $member = Security::getCurrentUser(); * if (!$member) $member = Security::getCurrentUser();
* return $member->inGroup('Editors'); * return $member->inGroup('Editors');
* } * }
* *
@ -3051,7 +3051,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* *
* <code> * <code>
* $extended = $this->extendedCan('canDoSomething', $member); * $extended = $this->extendedCan('canDoSomething', $member);
* if($extended !== null) return $extended; * if ($extended !== null) return $extended;
* else return $normalValue; * else return $normalValue;
* </code> * </code>
* *
@ -3481,14 +3481,17 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @param int|bool $idOrCache The id of the element, or cache if called on target class * @param int|bool $idOrCache The id of the element, or cache if called on target class
* @param boolean $cache See {@link get_one()} * @param boolean $cache See {@link get_one()}
* *
* @return static The element * @return static|null The element
*/ */
public static function get_by_id($classOrID, $idOrCache = null, $cache = true) public static function get_by_id($classOrID, $idOrCache = null, $cache = true)
{ {
// Shift arguments if passing id in first or second argument // Shift arguments if passing id in first or second argument
list ($class, $id, $cached) = is_numeric($classOrID) list ($class, $id, $cached) = is_numeric($classOrID)
? [get_called_class(), $classOrID, isset($idOrCache) ? $idOrCache : $cache] ? [get_called_class(), (int) $classOrID, isset($idOrCache) ? $idOrCache : $cache]
: [$classOrID, $idOrCache, $cache]; : [$classOrID, (int) $idOrCache, $cache];
if ($id < 1) {
return null;
}
// Validate class // Validate class
if ($class === self::class) { if ($class === self::class) {