Partially revert previous commit and let meta data discovery work on no...

Partially revert previous commit  and let meta data discovery work on no convertible portal types as well.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29792 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_contributeContent.xml

@@ -90,7 +90,7 @@ try:\n
   new_content = context.portal_contributions.newContent(**kw)\n
   if new_content.isSupportBaseDataConversion():\n
     new_content.processFile()\n
-    merged_content = new_content.Document_convertToBaseFormatAndDiscoverMetadata(file_name=file_name)\n
+  merged_content = new_content.Document_convertToBaseFormatAndDiscoverMetadata(file_name=file_name)\n
 except ConversionError, Fault:\n
   # there are errors during ingestion content\n
   failure = 1\n

product/ERP5/bootstrap/erp5_xhtml_style/bt/revision

-843
\ No newline at end of file
+844
\ No newline at end of file