Fixed bug #16436: Call to undefined method SC_mod_tools_em_index::uploadExtensionToTER()
authorSteffen Kamper <info@sk-typo3.de>
Wed, 17 Nov 2010 11:17:02 +0000 (11:17 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 17 Nov 2010 11:17:02 +0000 (11:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9440 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/em/classes/connection/class.tx_em_connection_ter.php
typo3/sysext/em/classes/extensions/class.tx_em_extensions_details.php
typo3/sysext/em/classes/import/class.tx_em_import_extensionlistimporter.php
typo3/sysext/em/classes/index.php

index 94c4c39..601f5bd 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-17  Steffen Kamper  <steffen@typo3.org>
+
+       * Fixed bug #16436: Call to undefined method SC_mod_tools_em_index::uploadExtensionToTER()
+
 2010-11-17  Jochen Rau <jochen.rau@typoplanet.de>
 
        * Added feature #16395: Add basic support for RDFa in core (semantic web)
index 76935f9..4ffa25b 100644 (file)
@@ -227,7 +227,7 @@ class tx_em_Connection_Ter {
         * @return
         */
        function uploadToTER($em) {
-               $uArr = $this->emObj->makeUploadarray($em['extKey'], $em['extInfo']);
+               $uArr = $this->emObj->extensionDetails->makeUploadarray($em['extKey'], $em['extInfo']);
                if (!is_array($uArr)) {
                        return $uArr;
                }
index c5a7ec9..eaf67d4 100644 (file)
@@ -193,7 +193,7 @@ class tx_em_Extensions_Details {
         */
        function uploadExtensionToTER($em) {
                $msg = '';
-               $response = $this->terConnection->uploadToTER($em);
+               $response = $this->parentObject->terConnection->uploadToTER($em);
 
                if (!is_array($response)) {
                        return $response;
index eccdde2..3d7a48f 100644 (file)
@@ -158,7 +158,9 @@ class tx_em_Import_ExtensionListImporter implements SplObserver {
                                self::$fieldIndicesNoQuote
                        );
                }
-               tx_em_Database::insertLastVersion($this->repositoryUID);
+               $extensions = tx_em_Database::insertLastVersion($this->repositoryUID);
+               tx_em_Database::updateRepositoryCount($extensions, $this->repositoryUID);
+
                return $this->sumRecords;
        }
 
index b6116c3..235b659 100644 (file)
@@ -1863,7 +1863,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                                                if ($em['action'] == 'doUpload') {
                                                        $em['extKey'] = $extKey;
                                                        $em['extInfo'] = $list[$extKey];
-                                                       $content = $this->uploadExtensionToTER($em);
+                                                       $content = $this->extensionDetails->uploadExtensionToTER($em);
                                                        $content .= $this->doc->spacer(10);
                                                        // Must reload this, because EM_CONF information has been updated!
                                                        list($list,) = $this->extensionList->getInstalledExtensions();
@@ -2670,6 +2670,20 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
                return $content;
        }
 
+
+       // Function wrappers for compatibility
+
+       /**
+        * Reports back if installation in a certain scope is possible.
+        *
+        * @param       string          Scope: G, L, S
+        * @param       string          Extension lock-type (eg. "L" or "G")
+        * @return      boolean         True if installation is allowed.
+        */
+       public static function importAsType($type, $lockType = '') {
+               return tx_em_Tools::importAsType($type, $lockType);
+       }
+
 }
 
 // Make instance: