From dce4e15ca49d7b22c0627fbde5bf304d0e1beb4f Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo.renner@typo3.org>
Date: Sun, 20 Jan 2008 15:21:58 +0000
Subject: [PATCH] changed the way how javascritp and css files needed to be
 referenced when adding them to backend.php, now relative to typo3/

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2934 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                                 |  1 +
 typo3/backend.php                         | 14 ++------------
 typo3/classes/class.backendsearchmenu.php |  2 +-
 typo3/classes/class.clearcachemenu.php    |  2 +-
 typo3/classes/class.shortcutmenu.php      |  2 +-
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b35508bd109a..154a04841fd9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 	* fixed bug #7211: "Start in Module" does not work anymore
 	* fixed check for wrong implementation of toolbarItem interface
 	* renamed typo3/css/verticalmenu.css to modulemenu.css
+	* changed the way how javascritp and css files needed to be referenced when adding them to backend.php, now relative to typo3/
 
 2008-01-19  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
diff --git a/typo3/backend.php b/typo3/backend.php
index 409a5ce4a041..05bb51c3589a 100644
--- a/typo3/backend.php
+++ b/typo3/backend.php
@@ -667,12 +667,7 @@ class TYPO3backend {
 		$jsFileAdded = false;
 
 			//TODO add more checks if neccessary
-		if(file_exists(t3lib_div::resolveBackPath(PATH_site.$javascriptFile))) {
-
-			if(t3lib_div::isFirstPartOfStr($javascriptFile, 'typo3/')) {
-				$javascriptFile = substr($javascriptFile, 6); // make relative to typo3/
-			}
-
+		if(file_exists(t3lib_div::resolveBackPath(PATH_typo3.$javascriptFile))) {
 			$this->jsFiles[] = $javascriptFile;
 			$jsFileAdded     = true;
 		}
@@ -705,12 +700,7 @@ class TYPO3backend {
 		$cssFileAdded = false;
 
 			//TODO add more checks if neccessary
-		if(file_exists(t3lib_div::resolveBackPath(PATH_site.$cssFile))) {
-
-			if(t3lib_div::isFirstPartOfStr($cssFile, 'typo3/')) {
-				$cssFile = substr($cssFile, 6); // make relative to typo3/
-			}
-
+		if(file_exists(t3lib_div::resolveBackPath(PATH_typo3.$cssFile))) {
 				// prevent overwriting existing css files
 			if(empty($this->cssFiles[$cssFileName])) {
 				$this->cssFiles[$cssFileName] = $cssFile;
diff --git a/typo3/classes/class.backendsearchmenu.php b/typo3/classes/class.backendsearchmenu.php
index 531898933555..13835ca627cf 100644
--- a/typo3/classes/class.backendsearchmenu.php
+++ b/typo3/classes/class.backendsearchmenu.php
@@ -77,7 +77,7 @@ class BackendSearchMenu implements backend_toolbarItem {
 	 * @return	void
 	 */
 	private function addJavascriptToBackend() {
-		$this->backendReference->addJavascriptFile('typo3/js/backendsearch.js');
+		$this->backendReference->addJavascriptFile('js/backendsearch.js');
 	}
 
 	/**
diff --git a/typo3/classes/class.clearcachemenu.php b/typo3/classes/class.clearcachemenu.php
index 3bb83c126319..64f74c6eebd4 100644
--- a/typo3/classes/class.clearcachemenu.php
+++ b/typo3/classes/class.clearcachemenu.php
@@ -123,7 +123,7 @@ class ClearCacheMenu implements backend_toolbarItem {
 	 * @return	void
 	 */
 	private function addJavascriptToBackend() {
-		$this->backendReference->addJavascriptFile('typo3/js/clearcachemenu.js');
+		$this->backendReference->addJavascriptFile('js/clearcachemenu.js');
 	}
 
 	/**
diff --git a/typo3/classes/class.shortcutmenu.php b/typo3/classes/class.shortcutmenu.php
index 38b7848ba4ce..232c850b278b 100644
--- a/typo3/classes/class.shortcutmenu.php
+++ b/typo3/classes/class.shortcutmenu.php
@@ -212,7 +212,7 @@ class ShortcutMenu implements backend_toolbarItem {
 	 * @return	void
 	 */
 	private function addJavascriptToBackend() {
-		$this->backendReference->addJavascriptFile('typo3/js/shortcutmenu.js');
+		$this->backendReference->addJavascriptFile('js/shortcutmenu.js');
 	}
 
 	/**
-- 
2.20.1