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
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2020-04-20 02:20:46 +0300
committerGitHub <noreply@github.com>2020-04-20 02:20:46 +0300
commit4469a9adad4953298afefb65d6e831e826f42132 (patch)
treee57395decc85166b62a545b06f8512aecd293b3d /plugins/CoreUpdater
parentcf0976f72017a17b3abb70c24123b9bd11f6eb5e (diff)
try to fix two UI tests (#15755)
* try to fix two UI tests * update screenshots * try to fix oneclickupdate * try to fix build * remove debugging code * updates ui files * remove debugging code * Revert "try to fix oneclickupdate" This reverts commit 246de42be2e27e37b56231f4fab1bab3b5b6fb20. * revert oneclickupdate change * Use 4.x-dev TagManager submodule. * Use temp token auth in one click update to make sure second request always works. * try to fix random failure * add expected screenshot * try update again Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CoreUpdater')
-rw-r--r--plugins/CoreUpdater/Updater.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/CoreUpdater/Updater.php b/plugins/CoreUpdater/Updater.php
index d3f8f54e1c..406be9f06d 100644
--- a/plugins/CoreUpdater/Updater.php
+++ b/plugins/CoreUpdater/Updater.php
@@ -15,6 +15,7 @@ use Piwik\Filechecks;
use Piwik\Filesystem;
use Piwik\Http;
use Piwik\Option;
+use Piwik\Piwik;
use Piwik\Plugin\Manager as PluginManager;
use Piwik\Plugin\ReleaseChannels;
use Piwik\Plugins\CorePluginsAdmin\PluginInstaller;
@@ -124,8 +125,10 @@ class Updater
throw new UpdaterException($e, $messages);
}
+ $tempTokenAuth = Piwik::requestTemporarySystemAuthToken('OneClickUpdate', 1);
$partTwoUrl = Url::getCurrentUrlWithoutQueryString() . Url::getCurrentQueryStringWithParametersModified([
'action' => 'oneClickUpdatePartTwo',
+ 'token_auth' => $tempTokenAuth,
]);
$response = Http::sendHttpRequest($partTwoUrl, 300);