*** empty log message ***
authorMichael Stucki <michael.stucki@typo3.org>
Mon, 18 Apr 2005 12:34:24 +0000 (12:34 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Mon, 18 Apr 2005 12:34:24 +0000 (12:34 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@657 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/install/mod/class.tx_install.php

index c25674f..c106f9d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@
 
 2005-04-18  Rupert Germann  <rupi@gmx.li>
 
 
 2005-04-18  Rupert Germann  <rupi@gmx.li>
 
-       * added a condition that removes wrong default values from autoinc-lines when importing static data. (bug 416 related).
+       * Added a condition that removes wrong default values from autoinc-lines when importing static data. (bug #416 related).
 
 2005-04-18  Michael Stucki  <michael@typo3.org>
 
 
 2005-04-18  Michael Stucki  <michael@typo3.org>
 
index ad9449b..8120bfb 100755 (executable)
@@ -3047,7 +3047,7 @@ if (version == "n3") {
                        for ($a=0; $a<strlen($string); $a++) {
                                $out .= '&#'.ord(substr($string, $a, 1)).';';
                        }
                        for ($a=0; $a<strlen($string); $a++) {
                                $out .= '&#'.ord(substr($string, $a, 1)).';';
                        }
-               } else  {
+               } else  {
                        for ($a=0; $a<strlen($string); $a++)    {
                                $charValue = ord(substr($string,$a,1));
                                $charValue+= intval($this->spamProtectEmailAddresses)*($back?-1:1);
                        for ($a=0; $a<strlen($string); $a++)    {
                                $charValue = ord(substr($string,$a,1));
                                $charValue+= intval($this->spamProtectEmailAddresses)*($back?-1:1);
index 019b65a..b9391ff 100755 (executable)
@@ -4576,16 +4576,16 @@ A:hover {color: #000066}
        }
 
        /**
        }
 
        /**
-        * [Describe function...]
+        * Convert a size from human-readable form into bytes
         *
         *
-        * @param       [type]          $bytes: ...
-        * @return      [type]          ...
+        * @param       string          A string containing the size in bytes, kilobytes or megabytes. Example: 64M
+        * @return      string          The string is returned in bytes and can also hold floating values
         */
        function convertByteSize($bytes)        {
                if (stristr($bytes,"m"))        {
         */
        function convertByteSize($bytes)        {
                if (stristr($bytes,"m"))        {
-                       $bytes=doubleval($bytes)*1024*1024;
+                       $bytes=floatval($bytes)*1024*1024;
                } elseif (stristr($bytes,"k"))  {
                } elseif (stristr($bytes,"k"))  {
-                       $bytes=doubleval($bytes)*1024;
+                       $bytes=floatval($bytes)*1024;
                }
                return $bytes;
        }
                }
                return $bytes;
        }