Skip to content
Extraits de code Groupes Projets
Valider a7868118 rédigé par mattab's avatar mattab
Parcourir les fichiers

Small changes to trigger new build

parent fa4b7c4a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -714,9 +714,18 @@ class PiwikTracker ...@@ -714,9 +714,18 @@ class PiwikTracker
* Forces the requests to be recorded for the specified Visitor ID * Forces the requests to be recorded for the specified Visitor ID
* rather than using the heuristics based on IP and other attributes. * rather than using the heuristics based on IP and other attributes.
* *
* This is typically used with the Javascript getVisitorId() function.
*
* Allowed only for Admin/Super User, must be used along with setTokenAuth(). * Allowed only for Admin/Super User, must be used along with setTokenAuth().
*
* For example, on your website if you use the Javascript tracker in some pages
* and the PHP tracker in other pages, you can write:
* $v->setVisitorId( $v->getVisitorId() );
*
* This will set this visitor's ID to the ID found in the 1st party Piwik cookies
* (created earlier by the Javascript tracker).
*
* Alternatively you can set the Visitor ID based on a user attribute, for example the user email:
* $v->setVisitorId( substr(md5( $userEmail ), 0, 16));
*
* @see setTokenAuth() * @see setTokenAuth()
* @param string $visitorId 16 hexadecimal characters visitor ID, eg. "33c31e01394bdc63" * @param string $visitorId 16 hexadecimal characters visitor ID, eg. "33c31e01394bdc63"
* @throws Exception * @throws Exception
......
...@@ -49,11 +49,8 @@ class Piwik_LocalTracker extends PiwikTracker ...@@ -49,11 +49,8 @@ class Piwik_LocalTracker extends PiwikTracker
$plugins = Piwik_Config::getInstance()->Plugins['Plugins']; $plugins = Piwik_Config::getInstance()->Plugins['Plugins'];
$pluginsTracker = Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; $pluginsTracker = Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
$oldTrackerConfig = Piwik_Config::getInstance()->Tracker; $oldTrackerConfig = Piwik_Config::getInstance()->Tracker;
try {
Piwik_PluginsManager::getInstance()->unloadPlugins(); Piwik_PluginsManager::getInstance()->unloadPlugins();
} catch(Exception $e) {
// this fails for SegmentEditor for some reasons
}
// modify config // modify config
$GLOBALS['PIWIK_TRACKER_MODE'] = true; $GLOBALS['PIWIK_TRACKER_MODE'] = true;
......
...@@ -40,7 +40,8 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase ...@@ -40,7 +40,8 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
Piwik::createTables(); Piwik::createTables();
Piwik::createLogObject(); Piwik::createLogObject();
Piwik_PluginsManager::getInstance()->loadPlugins(array()); // Piwik_PluginsManager::getInstance()->loadPlugins(array());
IntegrationTestCase::loadAllPlugins();
} catch (Exception $e) { } catch (Exception $e) {
$this->fail("TEST INITIALIZATION FAILED: " . $e->getMessage()); $this->fail("TEST INITIALIZATION FAILED: " . $e->getMessage());
......
...@@ -54,6 +54,22 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase ...@@ -54,6 +54,22 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
} }
} }
/**
* @param $createEmptyDatabase
*/
protected static function installAndLoadPlugins($installPlugins)
{
$pluginsManager = Piwik_PluginsManager::getInstance();
$plugins = $pluginsManager->readPluginsDirectory();
$pluginsManager->loadPlugins($plugins);
if ($installPlugins)
{
$pluginsManager->installLoadedPlugins();
}
}
public static function loadAllPlugins() public static function loadAllPlugins()
{ {
$pluginsManager = Piwik_PluginsManager::getInstance(); $pluginsManager = Piwik_PluginsManager::getInstance();
...@@ -143,16 +159,8 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase ...@@ -143,16 +159,8 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
// We need to be SU to create websites for tests // We need to be SU to create websites for tests
Piwik::setUserIsSuperUser(); Piwik::setUserIsSuperUser();
Piwik_Tracker_Cache::deleteTrackerCache(); Piwik_Tracker_Cache::deleteTrackerCache();
self::installAndLoadPlugins( $installPlugins = $createEmptyDatabase);
// Load and install plugins
$pluginsManager = Piwik_PluginsManager::getInstance();
$plugins = $pluginsManager->readPluginsDirectory();
$pluginsManager->loadPlugins($plugins);
if ($createEmptyDatabase) // only install if database is empty
{
$pluginsManager->installLoadedPlugins();
}
$_GET = $_REQUEST = array(); $_GET = $_REQUEST = array();
$_SERVER['HTTP_REFERER'] = ''; $_SERVER['HTTP_REFERER'] = '';
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter