TASK: Merge with v3

kiwi2101 · Jul 5, 2014 · 5407151 · 5407151
2 parents 7c70f2d + fc646db
commit 5407151
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/Classes/Domain/ImageProcessing/Typo3Processor.php b/Classes/Domain/ImageProcessing/Typo3Processor.php
@@ -198,6 +198,9 @@ protected function simulateFrontendEnvironment() {
 		$this->workingDirectoryBackup = getcwd();
 		chdir(PATH_site);
 
+
+
+
 		$typoScriptSetup = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
 		$GLOBALS['TSFE'] = new stdClass();
 		$template = t3lib_div::makeInstance('t3lib_TStemplate');
@@ -207,8 +210,19 @@ protected function simulateFrontendEnvironment() {
 		$GLOBALS['TSFE']->tmpl = $template;
 		$GLOBALS['TSFE']->tmpl->setup = $typoScriptSetup;
 		$GLOBALS['TSFE']->config = $typoScriptSetup;
+
+		$pidDetector = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager')->get('Tx_Yag_Utility_PidDetector');
+
+		if(is_array($pidDetector->getPids())) {
+			t3lib_div::makeInstance('Tx_PtExtbase_Utility_FakeFrontendFactory')->createFakeFrontEnd(current($pidDetector->getPids()));
+		}
+
 	}
-
+
+
+
+
+
 
 
 	/**

diff --git a/Classes/Domain/Import/AbstractImporter.php b/Classes/Domain/Import/AbstractImporter.php
@@ -146,27 +146,6 @@ abstract class Tx_Yag_Domain_Import_AbstractImporter implements Tx_Yag_Domain_Im
 	protected $fileSystemDiv;
 
 
-	/**
-	 * @var Tx_Yag_Utility_PidDetector
-	 */
-	protected $pidDetector;
-
-
-	/**
-	 * inject the pidDetector
-	 *
-	 * @param Tx_Yag_Utility_PidDetector pidDetector
-	 * @return void
-	 */
-	public function injectPidDetector(Tx_Yag_Utility_PidDetector $pidDetector) {
-		$this->pidDetector = $pidDetector;
-
-		if(is_array($pidDetector->getPids())) {
-			t3lib_div::makeInstance('Tx_PtExtbase_Utility_FakeFrontendFactory')->createFakeFrontEnd(current($pidDetector->getPids()));
-		}
-	}
-
-
 	/**
 	 * @param Tx_Extbase_Object_ObjectManager $objectManager
 	 */

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -3,7 +3,11 @@
 /***************************************************************
  * Extension Manager/Repository config file for ext "yag".
  *
+<<<<<<< HEAD
  * Auto generated 07-06-2014 17:56
+=======
+ * Auto generated 30-06-2014 04:46
+>>>>>>> v3
  *
  * Manual updates:
  * Only the data in the array - everything else is removed by next