Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #5 from mattclegg/master

stops the error 'ClassName' in where clause is ambiguous
  • Loading branch information...
commit 88a3b16973c17382e81a13261dae187ba60c7cc0 2 parents d46cd6e + 3f52cf6
@unclecheese authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  code/MultipleFileUploadField.php
  2. +1 −1  code/UploadifyField.php
View
2  code/MultipleFileUploadField.php
@@ -66,7 +66,7 @@ public function dosort() {
public function importlist(SS_HTTPRequest $request) {
if($id = $request->requestVar('FolderID')) {
if(is_numeric($id)) {
- $files = DataObject::get("File", "\"ParentID\" = $id AND \"ClassName\" != 'Folder'");
+ $files = DataObject::get("File", "\"ParentID\" = $id AND \"File\".\"ClassName\" != 'Folder'");
if($files && $this->form) {
if($record = $this->form->getRecord()) {
if($relation_name = $this->getForeignRelationName($record)) {
View
2  code/UploadifyField.php
@@ -371,7 +371,7 @@ public function deletefile() {
public function importlist(SS_HTTPRequest $request) {
if($id = $request->requestVar('FolderID')) {
if(is_numeric($id)) {
- $files = DataObject::get("File", "\"ParentID\" = $id AND \"ClassName\" != 'Folder'");
+ $files = DataObject::get("File", "\"ParentID\" = $id AND \"File\".\"ClassName\" != 'Folder'");
return $this->customise(array(
'Files' => $files
))->renderWith('ImportList');
Please sign in to comment.
Something went wrong with that request. Please try again.