aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-03-11 13:52:00 +0100
committerGitHub <noreply@github.com>2017-03-11 13:52:00 +0100
commit1739d6b314f410ee79d603f601f2845d55c48b4d (patch)
treec9b1bcc7c6461f8d1846f376d2b94adadceed6e4 /application
parent844021ab4c0d3dd6c26704648a736fa53244c914 (diff)
parentfe83d45c465bad94709ce5aacf7acad47ad75077 (diff)
downloadShaarli-1739d6b314f410ee79d603f601f2845d55c48b4d.tar.gz
Shaarli-1739d6b314f410ee79d603f601f2845d55c48b4d.tar.zst
Shaarli-1739d6b314f410ee79d603f601f2845d55c48b4d.zip
Merge pull request #799 from ArthurHoaro/plugins/piwik-url
Fix #773: set Piwik URL protocol
Diffstat (limited to 'application')
-rw-r--r--application/Updater.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/application/Updater.php b/application/Updater.php
index 27cb2f0a..fd7e2073 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -1,6 +1,7 @@
1<?php 1<?php
2use Shaarli\Config\ConfigJson; 2use Shaarli\Config\ConfigJson;
3use Shaarli\Config\ConfigPhp; 3use Shaarli\Config\ConfigPhp;
4use Shaarli\Config\ConfigManager;
4 5
5/** 6/**
6 * Class Updater. 7 * Class Updater.
@@ -363,6 +364,22 @@ class Updater
363 364
364 return true; 365 return true;
365 } 366 }
367
368 /**
369 * Add 'http://' to Piwik URL the setting is set.
370 *
371 * @return bool true if the update is successful, false otherwise.
372 */
373 public function updateMethodPiwikUrl()
374 {
375 if (! $this->conf->exists('plugins.PIWIK_URL') || startsWith($this->conf->get('plugins.PIWIK_URL'), 'http')) {
376 return true;
377 }
378
379 $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL'));
380 $this->conf->write($this->isLoggedIn);
381 return true;
382 }
366} 383}
367 384
368/** 385/**