Fixed bug #10735: Wrong returnUrl with clipboard actions
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_querygenerator.php
old mode 100755 (executable)
new mode 100644 (file)
index bf1502d..aa3e244
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 2001-2008 Christian Jul Jensen (christian@typo3.com)
+*  (c) 2001-2009 Christian Jul Jensen (christian@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -1482,7 +1482,9 @@ class t3lib_queryGenerator        {
                                $qString .= ' AND pid IN ('.$webMountPageTree.')';
                        }
                }
-               $fieldlist = $this->extFieldLists['queryFields'].',pid,deleted';
+               $fieldlist = $this->extFieldLists['queryFields'] .
+                       ',pid' .
+                       ($GLOBALS['TCA'][$this->table]['ctrl']['delete'] ? ',' . $GLOBALS['TCA'][$this->table]['ctrl']['delete'] : '');
                if (!$GLOBALS['SOBE']->MOD_SETTINGS['show_deleted'])    {
                        $qString .= t3lib_BEfunc::deleteClause($this->table);
                }
@@ -1511,6 +1513,7 @@ class t3lib_queryGenerator        {
                        <script language="javascript" type="text/javascript">
                                TBE_EDITOR.formname = "'.$formname.'";
                                TBE_EDITOR.formnameUENC = "'.rawurlencode($formname).'";
+                               TBE_EDITOR.backend_interface = "'.$GLOBALS['BE_USER']->uc['interfaceSetup'].'";
                                '.$this->extJSCODE.'
                        </script>';
                        return $out;
@@ -1521,7 +1524,7 @@ class t3lib_queryGenerator        {
         * Sets the current name of the input form.
         *
         * @param       string          $formName: The name of the form.
-        * @return      void 
+        * @return      void
         */
        public function setFormName($formName) {
                $this->formName = trim($formName);
@@ -1532,4 +1535,5 @@ class t3lib_queryGenerator        {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_querygenerator.php'])   {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_querygenerator.php']);
 }
+
 ?>