Revert "[BUGFIX] Change default label for sys_file_references" 76/40476/2
authorMarkus Klein <markus.klein@typo3.org>
Fri, 19 Jun 2015 21:01:44 +0000 (23:01 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Fri, 19 Jun 2015 21:02:05 +0000 (23:02 +0200)
This reverts commit 6a7d3a545ff32f24e860ee2d9141852c4a964cb9.

The original patch breaks the functional tests.

Change-Id: Ief8de9603ee1faf68f763c43b1cb48b72fa80ae1
Releases: master
Reverts: #67303
Reviewed-on: http://review.typo3.org/40476
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/core/Configuration/TCA/sys_file_reference.php
typo3/sysext/impexp/Tests/Functional/Fixtures/ImportExportXml/pages-and-ttcontent-with-image-but-not-included.xml
typo3/sysext/impexp/Tests/Functional/Fixtures/ImportExportXml/pages-and-ttcontent-with-image.xml

index 2d8b80b..29a042d 100644 (file)
@@ -2,7 +2,7 @@
 return array(
        'ctrl' => array(
                'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference',
-               'label' => 'uid_local',
+               'label' => 'uid',
                'formattedLabel_userFunc' => 'EXT:core/Classes/Resource/Service/UserFileInlineLabelService.php:TYPO3\\CMS\\Core\\Resource\\Service\\UserFileInlineLabelService->getInlineLabel',
                'formattedLabel_userFunc_options' => array(
                        'sys_file' => array(
index 947084d..5b24bc2 100644 (file)
@@ -67,7 +67,7 @@
                                <rec index="1" type="array">
                                        <uid>1</uid>
                                        <pid>1</pid>
-                                       <title>typo3_image2.jpg</title>
+                                       <title>1</title>
                                        <size>297</size>
                                        <relations index="rels" type="array">
                                                <element index="sys_file:1" type="array">
index 47889be..c9d3f8e 100644 (file)
@@ -67,7 +67,7 @@
                                <rec index="1" type="array">
                                        <uid>1</uid>
                                        <pid>1</pid>
-                                       <title>typo3_image2.jpg</title>
+                                       <title>1</title>
                                        <size>297</size>
                                        <relations index="rels" type="array">
                                                <element index="sys_file:1" type="array">