* Fixed bug #3960: Display correct version number in Install Tool (only when...
authorMichael Stucki <michael.stucki@typo3.org>
Wed, 23 Aug 2006 08:25:14 +0000 (08:25 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Wed, 23 Aug 2006 08:25:14 +0000 (08:25 +0000)
        * Fixed bug #4073: Extension manager doesn't find extensions if the search string contains a trailing space
        * Fixed bug #3990:  property disableTabInTextarea is not respected

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1689 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/class.em_index.php
typo3/sysext/install/mod/class.tx_install.php
typo3/template.php

index cb41425..85f347f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-23  Michael Stucki  <michael@typo3.org>
+
+       * Fixed bug #3960: Display correct version number in Install Tool (only when authenticated)
+       * Fixed bug #4073: Extension manager doesn't find extensions if the search string contains a trailing space
+       * Fixed bug #3990: $BE_USER property "disableTabInTextarea" is not respected
+
 2006-08-19  Dmitry Dulepov  <typo3@accio.lv>
 
        * Fix bug 4037: Link from Google AdWords fails due to wrong alias handling
index a162220..bc4073a 100644 (file)
@@ -356,9 +356,9 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
 
                // Setting GPvars:
                $this->CMD = t3lib_div::_GP('CMD');
-               $this->lookUpStr = t3lib_div::_GP('_lookUp');
+               $this->lookUpStr = trim(t3lib_div::_GP('_lookUp'));
                $this->listRemote = t3lib_div::_GP('ter_connect');
-               $this->listRemote_search = t3lib_div::_GP('ter_search');
+               $this->listRemote_search = trim(t3lib_div::_GP('ter_search'));
 
 
                        // Configure menu
index 5689abe..b09724c 100755 (executable)
@@ -4808,7 +4808,8 @@ a:hover {color: #006; text-decoration:underline:}
                                        <tr>
                                                <td bgcolor="#F4F0E8">
                                                <div align="center"><span class="size4text"><strong>TYPO3 '.TYPO3_branch.' Install Tool</strong></span></div>
-                                               <div align="center"><span style="color:navy;"><strong>Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'</strong></span></div><br />
+                                               <div align="center"><span style="color:navy;"><strong>Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'</strong></span></div>
+                                               '.($this->passwordOK ? '<div align="center"><span style="color:navy;"><strong>Version: '.TYPO3_version.'</strong></span></div>':'').'<br />
 
 '.($this->step?$this->stepHeader():$this->menu()).$content.'<hr />'.$this->note123().$this->endNotes().'
                                                </td>
index dc9e770..b0f9573 100755 (executable)
@@ -642,7 +642,7 @@ class template {
                }
 
                $tabJScode = '';
-               if (!$BE_USER->uc['disableTabInTextarea'])      {
+               if (!$GLOBALS['BE_USER']->uc['disableTabInTextarea'])   {
                                // This loads the tabulator-in-textarea feature. It automatically modifies every textarea which is found.
                        $tabJScode = '<script src="'.$this->backPath.'tab.js" type="text/javascript"></script>';
                }