Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-05-09 01:13:57 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-05-09 01:13:57 +0400
commit2f6245527586095c5c16ac06e6c55894cb0d4d1a (patch)
treee1215fd6aff39c8b912dc923c058bdb028b48e30 /core
parent9bac8a7ea340c881f6ad909cd3e4ba4560c6def2 (diff)
- refs #683 killing quicktime detection
- fixing broken updater code regression
Diffstat (limited to 'core')
-rw-r--r--core/Piwik.php3
-rw-r--r--core/Tracker/Visit.php3
-rw-r--r--core/Updates/0.2.35-rc2.php3
-rw-r--r--core/Version.php2
4 files changed, 5 insertions, 6 deletions
diff --git a/core/Piwik.php b/core/Piwik.php
index 428b17ead6..addde44204 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -618,7 +618,6 @@ class Piwik
config_flash TINYINT(1) NOT NULL,
config_java TINYINT(1) NOT NULL,
config_director TINYINT(1) NOT NULL,
- config_quicktime TINYINT(1) NOT NULL,
config_realplayer TINYINT(1) NOT NULL,
config_windowsmedia TINYINT(1) NOT NULL,
config_cookie TINYINT(1) NOT NULL,
@@ -925,7 +924,7 @@ class Piwik
require_once "CoreUpdater/Controller.php";
$updaterController = new Piwik_CoreUpdater_Controller();
- $updaterController->runUpdaterAndExit($componentsWithUpdateFile);
+ $updaterController->runUpdaterAndExit($updater, $componentsWithUpdateFile);
}
/**
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 56dcc01eda..7c308f0706 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -289,7 +289,6 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
'config_flash' => $userInfo['config_flash'],
'config_java' => $userInfo['config_java'],
'config_director' => $userInfo['config_director'],
- 'config_quicktime' => $userInfo['config_quicktime'],
'config_realplayer' => $userInfo['config_realplayer'],
'config_windowsmedia' => $userInfo['config_windowsmedia'],
'config_cookie' => $userInfo['config_cookie'],
@@ -526,7 +525,6 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
$plugin_Flash = Piwik_Common::getRequestVar( 'fla', 0, 'int', $this->request);
$plugin_Director = Piwik_Common::getRequestVar( 'dir', 0, 'int', $this->request);
- $plugin_Quicktime = Piwik_Common::getRequestVar( 'qt', 0, 'int', $this->request);
$plugin_RealPlayer = Piwik_Common::getRequestVar( 'realp', 0, 'int', $this->request);
$plugin_Pdf = Piwik_Common::getRequestVar( 'pdf', 0, 'int', $this->request);
$plugin_WindowsMedia = Piwik_Common::getRequestVar( 'wma', 0, 'int', $this->request);
@@ -574,7 +572,6 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
'config_flash' => $plugin_Flash,
'config_java' => $plugin_Java,
'config_director' => $plugin_Director,
- 'config_quicktime' => $plugin_Quicktime,
'config_realplayer' => $plugin_RealPlayer,
'config_windowsmedia' => $plugin_WindowsMedia,
'config_cookie' => $plugin_Cookie,
diff --git a/core/Updates/0.2.35-rc2.php b/core/Updates/0.2.35-rc2.php
new file mode 100644
index 0000000000..8db1c58135
--- /dev/null
+++ b/core/Updates/0.2.35-rc2.php
@@ -0,0 +1,3 @@
+<?php
+
+Piwik_Query( "ALTER TABLE ". Piwik::prefixTable('log_visit') . " DROP config_quicktime" );
diff --git a/core/Version.php b/core/Version.php
index 8f02c57b7c..e867a4e724 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -1,5 +1,5 @@
<?php
final class Piwik_Version {
- const VERSION = '0.2.34';
+ const VERSION = '0.2.35-rc2';
}