diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index ef906cb..f5bc211 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -275,7 +275,7 @@ module FormsHelper
     if find_options.empty?
       folders = profile.folders
     else
-      folders = profile.folders.find :all, find_options
+      folders = profile.folders.where(find_options)
     end
     result = labelled_form_field(
       label_text,
diff --git a/app/views/cms/_text_editor_sidebar.rhtml b/app/views/cms/_text_editor_sidebar.rhtml
index 751baa6..dd88dcc 100644
--- a/app/views/cms/_text_editor_sidebar.rhtml
+++ b/app/views/cms/_text_editor_sidebar.rhtml
@@ -13,7 +13,7 @@
           <%= select_profile_folder(
                 _('Choose folder to upload files:'),
                 :parent_id, profile, default_folder, {}, {},
-                {:conditions => 'type="Folder" or type="Gallery"'}
+                'type="Folder" or type="Gallery"'
           ) %>
         </div>
         <p><%= file_field_tag('file1') %></p>
--
libgit2 0.21.2