Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

BUGFIX #24 Fixed Typo #26

Merged
merged 1 commit into from Mar 26, 2012
Jump to file or symbol
Failed to load files and symbols.
+0 −3
Split
View
@@ -513,19 +513,16 @@ public function FolderDropdown($id = null) {
* @return DropdownField
*/
public function ImportDropdown() {
-<<<<<<< HEAD
$UploadFolder = $this->getUploadFolder();
$id = ($UploadFolder!="Uploads") ? Folder::findOrMake($UploadFolder)->ID : null;
$class = (class_exists("SimpleTreeDropdownField")) ? "SimpleTreeDropdownField" : "DropdownField";
$d = new $class("ImportFolderID_{$this->id()}", _t('Uploadify.CHOOSEIMPORTFOLDER','Choose a folder'), "Folder", $id, "Filename");
-=======
if(class_exists("SimpleTreeDropdownField")){
$d=new SimpleTreeDropdownField("ImportFolderID_{$this->id()}", _t('Uploadify.CHOOSEIMPORTFOLDER','Choose a folder'), "Folder", null, "Filename");
}else{
$folders=DataObject::get("Folder");
$d=new DropdownField("ImportFolderID_{$this->id()}", _t('Uploadify.CHOOSEIMPORTFOLDER','Choose a folder'), $folders->toDropDownMap("ID","Title"));
}
->>>>>>> removed DOM dependancy
$d->setEmptyString('-- ' . _t('Uploadify.PLEASESELECT','Select a folder') . ' --');
$d->addExtraClass("{'url' : '".$this->Link('importlist')."' }");
return $d;