* Fixed another small bug in detection of simulateStaticDocuments.
authorKasper Skårhøj <kasper@typo3.org>
Wed, 31 Mar 2004 14:51:20 +0000 (14:51 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Wed, 31 Mar 2004 14:51:20 +0000 (14:51 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@172 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_pibase.php

index 26e2255..649a7ce 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-31  Kasper Skårhøj,,,  <kasper@typo3.com>
 
+       * Fixed another small bug in detection of simulateStaticDocuments.
+
+2004-03-31  Kasper Skårhøj,,,  <kasper@typo3.com>
+
        * Fixed distinction between ' and " in EM.
 
 2004-03-31  Kasper Skårhøj,,,  <kasper@typo3.com>
index 1026a65..fe48b62 100755 (executable)
                        // Resolving of "simulateStaticDocuments" URLs:
                if ($this->siteScript && substr($this->siteScript,0,9)!='index.php')    {               // If there has been a redirect (basically; we arrived here otherwise than via "index.php" in the URL) this can happend either due to a CGI-script or because of reWrite rule. Earlier we used $GLOBALS['HTTP_SERVER_VARS']['REDIRECT_URL'] to check but
                        $uParts = parse_url($this->siteScript); // Parse the path:
-                       $requestFilename = basename($uParts['path']);           // This is the filename of the script/simulated html-file.
-                       if (dirname($uParts['path'])=='.' && $requestFilename && substr($requestFilename,-5)=='.html')  {
-                               $parts = explode('.',$requestFilename);
+                       $fI = t3lib_div::split_fileref($uParts['path']);
+
+                       if (!$fI['path'] && $fI['file'] && substr($fI['file'],-5)=='.html')     {
+                               $parts = explode('.',$fI['file']);
                                $pCount = count($parts);
                                if ($pCount>2)  {
                                        $this->type = intval($parts[$pCount-2]);
index d0597e7..9ce2b39 100755 (executable)
@@ -470,7 +470,7 @@ class tslib_pibase {
                        ($showResultCount ? '
                        <p>'.sprintf(
                                str_replace('###SPAN_BEGIN###','<span'.$this->pi_classParam('browsebox-strong').'>',$this->pi_getLL('pi_list_browseresults_displays','Displaying results ###SPAN_BEGIN###%s to %s</span> out of ###SPAN_BEGIN###%s</span>')),
-                               $pR1,
+                               $this->internal['res_count'] > 0 ? $pR1 : 0,
                                min(array($this->internal['res_count'],$pR2)),
                                $this->internal['res_count']
                                ).'</p>':''
@@ -1234,4 +1234,4 @@ class tslib_pibase {
 }
 
 // NO extension of class - does not make sense here.
-?>
\ No newline at end of file
+?>