[TASK] Install Tool: System Information shows empty values 11/24611/3
authorPhilipp Gampe <philipp.gampe@typo3.org>
Fri, 11 Oct 2013 22:57:37 +0000 (00:57 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Sat, 18 Jan 2014 13:31:05 +0000 (14:31 +0100)
Adopt the list such that either port or socket is shown.
Print "default socket" for an empty socket definition.

Resolves: #52712
Releases: 6.2
Change-Id: I28bd59f9f66ce314d31908c3790c9f75ca5e2a44
Reviewed-on: https://review.typo3.org/24611
Reviewed-by: Markus Klein
Reviewed-by: Marcin S?gol
Tested-by: Marcin S?gol
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/SystemInformation.html

index efbf3dd..ecd19a2 100644 (file)
        <dd>{databaseUsername} </dd>
        <dt>Database host:</dt>
        <dd>{databaseHost} </dd>
-       <dt>Database port:</dt>
-       <dd>{databasePort} </dd>
-       <dt>Database socket:</dt>
-       <dd>{databaseSocket} </dd>
+       <f:if condition="{databasePort}">
+               <f:then>
+                       <dt>Database port:</dt>
+                       <dd>{databasePort} </dd>
+               </f:then>
+               <f:else>
+                       <dt>Database socket:</dt>
+                       <f:if condition="{databaseSocket}">
+                               <f:then>
+                                       <dd>{databaseSocket} </dd>
+                               </f:then>
+                               <f:else>
+                                       <dd><em>default socket</em> </dd>
+                               </f:else>
+                       </f:if>
+               </f:else>
+       </f:if>
        <dt>Database tables:</dt>
        <dd>{databaseNumberOfTables} </dd>
 </dl>