Minor

2 files changed, 5 insertions, 2 deletions

diff --git a/core/Config.php b/core/Config.php
index 1da843e915..5878d30d9d 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -72,6 +72,7 @@ class Config extends Singleton
      *
      * @param string $pathLocal
      * @param string $pathGlobal
+     * @param string $pathCommon
      */
     public function setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null)
     {
@@ -209,7 +210,7 @@ class Config extends Singleton
      *     $config->save();
      *
      * @param string $hostname eg piwik.example.com
-     *
+     * @return string
      * @throws \Exception In case the domain contains not allowed characters
      */
     public function forceUsageOfLocalHostnameConfig($hostname)
@@ -478,6 +479,7 @@ class Config extends Singleton
      *
      * @param array $configLocal
      * @param array $configGlobal
+     * @param array $configCommon
      * @param array $configCache
      * @return string
      */
@@ -576,10 +578,11 @@ class Config extends Singleton
      *
      * @param array $configLocal
      * @param array $configGlobal
+     * @param array $configCommon
      * @param array $configCache
      * @param string $pathLocal
      *
-     * @throws Exception if config file not writable
+     * @throws \Exception if config file not writable
      */
     protected function writeConfig($configLocal, $configGlobal, $configCommon, $configCache, $pathLocal)
     {
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject 41ab98ba26ed01c4206e32ea26fca0ec0218391
+Subproject 0326908fc05cf839cb0f38117b433b7986058e3