[TYPO3-dev] trouble patching trunk

[Philipp Gampe]

Hi list,

Im not that experienced in patching and co....

I tried to test RFC #13740 from core list. It applies cleanly on my local  
machine, but fails on the server.

this is what I have tried on the server:

[webseiten] svn up t3
U    t3/ChangeLog
U    t3/typo3/sysext/viewpage/view/index.php
Updated to revision 7077.
(17:14:48) [webseiten] cd t3
(17:15:52) [t3] patch -p0 < ../13740-show-clickmenu-nosysdomain.diff
patching file t3lib/class.t3lib_befunc.php
Hunk #1 FAILED at 2663.
1 out of 1 hunk FAILED -- saving rejects to file  
t3lib/class.t3lib_befunc.php.rej
(17:16:07) [t3]

and on my local computer:

patch -p0 < ../../Desktop/temp/13740-show-clickmenu-nosysdomain.diff
(Stripping trailing CRs from patch.)
patching file t3lib/class.t3lib_befunc.php

So the patch works just fine... what can I do to solve the server part?  
Just delete the directory and make a fresh checkout?

Best regards
Phil

attached a copy of the file t3lib/class.t3lib_befunc.php.rej


***************
*** 2663,2674 ****
   	 * @param integer $pageId the page ID to use, must be > 0
   	 * @param array $rootLine the root line structure to use
   	 *
- 	 * @return string the full domain including the protocol http:// or  
https://
   	 *
   	 * @author Michael Klapper <michael.klapper at aoemedia.de>
   	 */
   	public static function getViewDomain($pageId, $rootLine = null) {
- 		$domain = t3lib_div::getIndpEnv('TYPO3_SITE_URL');

   		if (!is_array($rootLine)) {
   			$rootLine = t3lib_BEfunc::BEgetRootLine($pageId);
--- 2663,2674 ----
   	 * @param integer $pageId the page ID to use, must be > 0
   	 * @param array $rootLine the root line structure to use
   	 *
+ 	 * @return string the full domain including the protocol http:// or  
https://, but without the trailing '/'
   	 *
   	 * @author Michael Klapper <michael.klapper at aoemedia.de>
   	 */
   	public static function getViewDomain($pageId, $rootLine = null) {
+ 		$domain = rtrim(t3lib_div::getIndpEnv('TYPO3_SITE_URL'), '/');

   		if (!is_array($rootLine)) {
   			$rootLine = t3lib_BEfunc::BEgetRootLine($pageId);



-- 
Philipp Gampe
http://www.philippgampe.info