Просмотр исходного кода

Merge pull request #648 from librespeed/633-invalid-username-password-variables-with-mssql-not-using-windows-authentication

fix: mysqlsetting were used for mssql
sstidl 1 год назад
Родитель
Сommit
7327d2f2f5
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      doc.md
  2. 1 1
      results/telemetry_db.php

+ 1 - 1
doc.md

@@ -77,7 +77,7 @@ To use this function, you will need a database. The test supports MySQL, Postgre
 
 
 This step is only required for MySQL, PostgreSQL and MSSQL. If you want to use SQLite, skip to the next step.
 This step is only required for MySQL, PostgreSQL and MSSQL. If you want to use SQLite, skip to the next step.
 
 
-Log into your database using phpMyAdmin or a similar software and create a new database. Inside the `results` folder you will find `telemetry_mysql.sql`, `telemetry_postgresql.sql` and `telemetry_mssql.sql`, which are templates for MySQL and PostgreSQL respectively. Import the one you need, and you will see a `speedtest_users` table in the database. You can delete the templates afterwards.
+Log into your database using phpMyAdmin or a similar software and create a new database. Inside the `results` folder you will find `telemetry_mysql.sql`, `telemetry_postgresql.sql` and `telemetry_mssql.sql`, which are templates for MySQL, PostgreSQL and MSSQL respectively. Import the one you need, and you will see a `speedtest_users` table in the database. You can delete the templates afterwards.
 
 
 ##### Configuring telemetry
 ##### Configuring telemetry
 
 

+ 1 - 1
results/telemetry_db.php

@@ -70,7 +70,7 @@ function getPdo($returnErrorMessage = false)
 			if($MsSql_WindowsAuthentication){
 			if($MsSql_WindowsAuthentication){
 				return new PDO($dsn, "", "", $pdoOptions);
 				return new PDO($dsn, "", "", $pdoOptions);
 			} else {
 			} else {
-				return new PDO($dsn, $MySql_username, $MySql_password, $pdoOptions);
+				return new PDO($dsn, $MsSql_username, $MsSql_password, $pdoOptions);
 			}
 			}
         }
         }