[phpwiki-checkins] SF.net SVN: phpwiki:[10905] trunk/lib/config.php

[<var...@us...>]

Revision: 10905
          http://sourceforge.net/p/phpwiki/code/10905
Author:   vargenau
Date:     2022-01-18 14:07:21 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Avoid double slash in Upload URL

Modified Paths:
--------------
    trunk/lib/config.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2022-01-16 19:38:49 UTC (rev 10904)
+++ trunk/lib/config.php	2022-01-18 14:07:21 UTC (rev 10905)
@@ -153,6 +153,9 @@
         return string_ends_with(UPLOAD_DATA_PATH, "/")
             ? UPLOAD_DATA_PATH : UPLOAD_DATA_PATH . "/";
     }
-    return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/")
-        . DATA_PATH . '/uploads/';
+    if (defined('DATA_PATH') && (DATA_PATH != '')) {
+        return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/") . DATA_PATH . '/uploads/';
+    } else {
+        return SERVER_URL . '/uploads/';
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.