Fixed bug #11970: RTE in quickedit mode (page module) is broken
authorSteffen Kamper <info@sk-typo3.de>
Fri, 18 Sep 2009 11:09:06 +0000 (11:09 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Fri, 18 Sep 2009 11:09:06 +0000 (11:09 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5976 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_pagerenderer.php
t3lib/class.t3lib_tceforms.php
typo3/template.php

index ecdba73..c10e73b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 
 2009-09-18  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #11970: RTE in quickedit mode (page module) is broken
        * Fixed bug #11996: Change compreed to compress with adding JS/CSS
        * Follow-up to bug #11985: Move ExtJs CSS-assignment to renderJsKibraries
        * Follow-up to bug #11985: backPath in FE is set too late
index 1f38a65..a2f00f5 100644 (file)
@@ -125,14 +125,14 @@ class t3lib_PageRenderer implements t3lib_Singleton {
         * @param string $backPath      relative path to typo3-folder. It varies for BE modules, in FE it will be typo3/
         * @return void
         */
-       public function __construct($templateFile = '', $backPath = '') {
+       public function __construct($templateFile = '', $backPath = NULL) {
 
                $this->reset();
 
                if (strlen($templateFile)) {
                        $this->templateFile = $templateFile;
                }
-               $this->backPath = $backPath;
+               $this->backPath = isset($backPath) ? $backPath : $GLOBALS['BACK_PATH'];
                
                $this->inlineJavascriptWrap = array(
                        '<script type="text/javascript">' . chr(10) . '/*<![CDATA[*/' . chr(10) . '<!-- ' . chr(10),
index edb3cbe..411efff 100644 (file)
@@ -5251,7 +5251,7 @@ class t3lib_TCEforms      {
 
                                // make textareas resizable and flexible
                        if (!($GLOBALS['BE_USER']->uc['resizeTextareas'] == '0' && $GLOBALS['BE_USER']->uc['resizeTextareas_Flexible'] == '0')) {
-                               $GLOBALS['SOBE']->doc->addStyleSheet('ext.resizable', $this->backPath . '../t3lib/js/extjs/ux/resize.css');
+                               $GLOBALS['SOBE']->doc->addStyleSheet('ext.resizable', '../t3lib/js/extjs/ux/resize.css');
                                $this->loadJavascriptLib('../t3lib/js/extjs/ux/ext.resizable.js');
                        }
                        $resizableSettings = array(
index 1269e5f..2a424b2 100644 (file)
@@ -1010,8 +1010,13 @@ $str.=$this->docBodyTagBegin().
         * @return      void
         */
        function addStyleSheet($key, $href, $title='', $relation='stylesheet') {
-               $this->pageRenderer->addCssFile($this->backPath . $href, $relation, $title);
+               if (strpos($href, '://') !== FALSE || substr($href, 0, 1) === '/') {
+                       $file = $href;
+               } else {
+                       $file = $this->backPath . $href;
                }
+               $this->pageRenderer->addCssFile($file, $relation, $title);
+       }
 
        /**
         * Insert post rendering document style into already rendered content