Remove deprecated SettingsPiwik::rewriteTmpPathWithInstanceId()

3 files changed, 3 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87d5e1a20..43d8996d26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 * The deprecated method `Config::getConfigSuperUserForBackwardCompatibility()` has been removed.
 * The deprecated methods `MenuAdmin::addEntry()` and `MenuAdmin::removeEntry()` have been removed. Use `Piwik\Plugin\Menu` instead.
 * The deprecated methods `MenuTop::addEntry()` and `MenuTop::removeEntry()` have been removed. Use `Piwik\Plugin\Menu` instead.
+* The deprecated method `SettingsPiwik::rewriteTmpPathWithInstanceId()` has been removed.
 
 ## Piwik 2.11.0
 
diff --git a/core/Session.php b/core/Session.php
index 9e49987072..9733593205 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -124,8 +124,7 @@ class Session extends Zend_Session
 			            			we recommend that you <a href='http://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>.";
             }
 
-            $pathToSessions = Filechecks::getErrorMessageMissingPermissions(Filesystem::getPathToPiwikRoot() . '/tmp/sessions/');
-            $pathToSessions = SettingsPiwik::rewriteTmpPathWithInstanceId($pathToSessions);
+            $pathToSessions = Filechecks::getErrorMessageMissingPermissions(self::getSessionsDirectory());
             $message = sprintf("Error: %s %s %s\n<pre>Debug: the original error was \n%s</pre>",
                 Piwik::translate('General_ExceptionUnableToStartSession'),
                 $pathToSessions,
@@ -147,8 +146,7 @@ class Session extends Zend_Session
      */
     public static function getSessionsDirectory()
     {
-        $path = PIWIK_USER_PATH . '/tmp/sessions';
-        return SettingsPiwik::rewriteTmpPathWithInstanceId($path);
+        return StaticContainer::get('path.tmp') . '/sessions';
     }
 
     public static function close()
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 6a30ddfecb..7a731b9b98 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -267,21 +267,6 @@ class SettingsPiwik
     }
 
     /**
-     * If Piwik uses per-domain config file, also make tmp/ folder per-domain
-     * @param $path
-     * @return string
-     * @throws \Exception
-     *
-     * @deprecated Get the 'path.tmp' config from the container instead.
-     */
-    public static function rewriteTmpPathWithInstanceId($path)
-    {
-        $tmp = '/tmp/';
-        $path = self::rewritePathAppendPiwikInstanceId($path, $tmp);
-        return $path;
-    }
-
-    /**
      * If Piwik uses per-domain config file, make sure CustomLogo is unique
      * @param $path
      * @return mixed