[Piwik-svn] r382 - in trunk: modules plugins/Installation tests/modules

svnmaster at piwik.org svnmaster at piwik.org
Mon Mar 17 16:41:53 CET 2008


Author: matt
Date: 2008-03-17 16:41:46 +0100 (Mon, 17 Mar 2008)
New Revision: 382

Modified:
   trunk/modules/Url.php
   trunk/plugins/Installation/FormDatabaseSetup.php
   trunk/tests/modules/PHP_Related.test.php
Log:
- trying to fix #133. Please apply the change to Url.php to make sure this fix is working. reopen the bug if the fix is not working

Modified: trunk/modules/Url.php
===================================================================
--- trunk/modules/Url.php	2008-03-17 15:25:51 UTC (rev 381)
+++ trunk/modules/Url.php	2008-03-17 15:41:46 UTC (rev 382)
@@ -117,7 +117,7 @@
 	static public function getCurrentHost()
 	{
 		if(isset($_SERVER['HTTPS'])
-			&& ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == true)
+			&& ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)
 			)
 		{
 			$url = 'https';

Modified: trunk/plugins/Installation/FormDatabaseSetup.php
===================================================================
--- trunk/plugins/Installation/FormDatabaseSetup.php	2008-03-17 15:25:51 UTC (rev 381)
+++ trunk/plugins/Installation/FormDatabaseSetup.php	2008-03-17 15:41:46 UTC (rev 382)
@@ -18,9 +18,7 @@
 class Piwik_Installation_FormDatabaseSetup extends Piwik_Form
 {
 	function init()
-	{
-		$urlToGoAfter = Piwik_Url::getCurrentUrl();			
-		
+	{		
 		$formElements = array(
 			array('text', 'host', 'mysql server', 'value='.'localhost'),
 			array('text', 'username', 'login'),

Modified: trunk/tests/modules/PHP_Related.test.php
===================================================================
--- trunk/tests/modules/PHP_Related.test.php	2008-03-17 15:25:51 UTC (rev 381)
+++ trunk/tests/modules/PHP_Related.test.php	2008-03-17 15:41:46 UTC (rev 382)
@@ -25,6 +25,11 @@
 	{
 	}
 	
+	function test_equal()
+	{
+		//aaaaaaaaaaaahhhhhhhhhhhh
+		$this->assertTrue( "off" == true);
+	}
 	function test_listEach()
 	{
 		$array = array('key' => 'elem2');



More information about the Piwik-svn mailing list