[!!!][TASK] Rewrite install tool

[Packages/TYPO3.CMS.git] / typo3 / sysext / core / Classes / Database / QueryGenerator.php

diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
index 6a4e8c1..0c425a8 100644 (file)
--- a/typo3/sysext/core/Classes/Database/QueryGenerator.php
+++ b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -4,7 +4,7 @@ namespace TYPO3\CMS\Core\Database;
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2001-2011 Christian Jul Jensen (christian@typo3.com)
+ *  (c) 2001-2013 Christian Jul Jensen (christian@typo3.com)
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -242,7 +242,6 @@ class QueryGenerator {
        public function makeFieldList() {
                $fieldListArr = array();
                if (is_array($GLOBALS['TCA'][$this->table])) {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA($this->table);
                        foreach ($GLOBALS['TCA'][$this->table]['columns'] as $fN => $value) {
                                $fieldListArr[] = $fN;
                        }
@@ -277,7 +276,6 @@ class QueryGenerator {
        public function init($name, $table, $fieldList = '') {
                // Analysing the fields in the table.
                if (is_array($GLOBALS['TCA'][$table])) {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA($table);
                        $this->name = $name;
                        $this->table = $table;
                        $this->fieldList = $fieldList ? $fieldList : $this->makeFieldList();
@@ -871,7 +869,6 @@ class QueryGenerator {
                                }
                                $counter = 1;
                                if (is_array($GLOBALS['TCA'][$from_table])) {
-                                       \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA($from_table);
                                        $labelField = $GLOBALS['TCA'][$from_table]['ctrl']['label'];
                                        $altLabelField = $GLOBALS['TCA'][$from_table]['ctrl']['label_alt'];
                                        if ($GLOBALS['TCA'][$from_table]['columns'][$labelField]['config']['items']) {
@@ -1533,7 +1530,7 @@ class QueryGenerator {
                $out = '';
                if ($this->extJSCODE) {
                        $out .= '
-                       <script language="javascript" type="text/javascript" src="' . $GLOBALS['BACK_PATH'] . '../t3lib/jsfunc.evalfield.js"></script>
+                       <script language="javascript" type="text/javascript" src="' . $GLOBALS['BACK_PATH'] . 'js/jsfunc.evalfield.js"></script>
                        <script language="javascript" type="text/javascript" src="' . $GLOBALS['BACK_PATH'] . 'jsfunc.tbe_editor.js"></script>
                        <script language="javascript" type="text/javascript">
                                TBE_EDITOR.formname = "' . $formname . '";