Merge pull request #3595 from annando/1707-realpath

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index b69fd91c45905d3d51ba6cf57e60491ddbf9140b..9c0ef1d08033327c421e247a906cb15f8e0edfdc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1232      );
+define ( 'DB_UPDATE_VERSION',      1233      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -1399,7 +1399,7 @@ function get_temppath() {
 
        if (($temppath != "") && App::directory_usable($temppath)) {
                // We have a temp path and it is usable
-               return $temppath;
+               return App::realpath($temppath);
        }
 
        // We don't have a working preconfigured temp path, so we take the system path.
@@ -1407,6 +1407,9 @@ function get_temppath() {
 
        // Check if it is usable
        if (($temppath != "") && App::directory_usable($temppath)) {
+               // Always store the real path, not the path through symlinks
+               $temppath = App::realpath($temppath);
+
                // To avoid any interferences with other systems we create our own directory
                $new_temppath = $temppath . "/" . $a->get_hostname();
                if (!is_dir($new_temppath)) {
@@ -1495,7 +1498,7 @@ function get_itemcachepath() {
 
        $itemcache = get_config('system', 'itemcache');
        if (($itemcache != "") && App::directory_usable($itemcache)) {
-               return $itemcache;
+               return App::realpath($itemcache);
        }
 
        $temppath = get_temppath();