Converted spaces to tabs in t3lib/t3lib_db.php
authorDmitry Dulepov <dmitry.dulepov@gmail.com>
Sat, 18 Oct 2008 11:52:21 +0000 (11:52 +0000)
committerDmitry Dulepov <dmitry.dulepov@gmail.com>
Sat, 18 Oct 2008 11:52:21 +0000 (11:52 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4323 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_db.php

index 500e61f..094c142 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-10-18  Dmitry Dulepov  <dmitry@typo3.org>
 
        * Fixed bug #9480: Enhance debug information with SQL data (thanks to Francois Suter for the inspiration)
+       * Converted spaces to tabs in t3lib/t3lib_db.php
 
 2008-10-17  Dmitry Dulepov  <dmitry@typo3.org>
 
index 4c3f0ee..44d11e5 100755 (executable)
@@ -913,22 +913,22 @@ class t3lib_DB {
                @ini_set('html_errors', 0);
 
                        // Check for client compression
-               $isLocalhost = ($TYPO3_db_host == 'localhost' || $TYPO3_db_host == '127.0.0.1');
-               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect'])  {
-                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['dbClientCompress'] && !$isLocalhost) {
-                                       // We use PHP's default value for 4th parameter (new_link), which is false.
-                                       // See PHP sources, for example: file php-5.2.5/ext/mysql/php_mysql.c, function php_mysql_do_connect(), near line 525
-                               $this->link = @mysql_connect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password, false, MYSQL_CLIENT_COMPRESS);
-                       } else {
-                               $this->link = @mysql_connect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
-                       }
-               } else {
-                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['dbClientCompress'] && !$isLocalhost) {
-                                       // See comment about 4th parameter in block above
-                               $this->link = @mysql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password, false, MYSQL_CLIENT_COMPRESS);
-                       } else {
-                               $this->link = @mysql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
-                       }
+               $isLocalhost = ($TYPO3_db_host == 'localhost' || $TYPO3_db_host == '127.0.0.1');
+               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect'])  {
+                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['dbClientCompress'] && !$isLocalhost) {
+                                       // We use PHP's default value for 4th parameter (new_link), which is false.
+                                       // See PHP sources, for example: file php-5.2.5/ext/mysql/php_mysql.c, function php_mysql_do_connect(), near line 525
+                               $this->link = @mysql_connect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password, false, MYSQL_CLIENT_COMPRESS);
+                       } else {
+                               $this->link = @mysql_connect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
+                       }
+               } else {
+                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['dbClientCompress'] && !$isLocalhost) {
+                                       // See comment about 4th parameter in block above
+                               $this->link = @mysql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password, false, MYSQL_CLIENT_COMPRESS);
+                       } else {
+                               $this->link = @mysql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password);
+                       }
                }
 
                $error_msg = $php_errormsg;
@@ -1176,7 +1176,7 @@ class t3lib_DB {
                if (!$res) {
                        $trace = FALSE;
                        $msg = 'Invalid database result resource detected';
-                       $trace = debug_backtrace();
+                       $trace = debug_backtrace();
                        array_shift($trace);
                        $cnt = count($trace);
                        for ($i=0; $i<$cnt; $i++)       {