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

don't cache in overridden instance_get(), as the fields are different for subclasses

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52286 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2008-04-08 00:03:43 +00:00 committed by Sam Minnee
parent 72eb00f4b1
commit 808f77ec4f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
filesystem/File.php
View File

@ -618,20 +618,18 @@ class File extends DataObject {
// Work out which columns we're actually going to select
// In short, we select everything except File.Content
if(!self::$dataobject_select) {
self::$dataobject_select = array();
foreach($query->select as $item) {
if($item == "`File`.*") {
$fileColumns = DB::query("SHOW FIELDS IN `File`")->column();
$columnsToAdd = array_diff($fileColumns, array('Content'));
foreach($columnsToAdd as $otherItem) self::$dataobject_select[] = '`File`.' . $otherItem;
} else {
self::$dataobject_select[] = $item;
}
$dataobject_select = array();
foreach($query->select as $item) {
if($item == "`File`.*") {
$fileColumns = DB::query("SHOW FIELDS IN `File`")->column();
$columnsToAdd = array_diff($fileColumns, array('Content'));
foreach($columnsToAdd as $otherItem) $dataobject_select[] = '`File`.' . $otherItem;
} else {
$dataobject_select[] = $item;
}
}
$query->select = self::$dataobject_select;
$query->select = $dataobject_select;
$records = $query->execute();
$ret = $this->buildDataObjectSet($records, $containerClass);