SF.net SVN: phpwiki:[10907] trunk

Revision: 10907
          http://sourceforge.net/p/phpwiki/code/10907
Author:   vargenau
Date:     2022-01-18 15:58:50 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Make the toolbar image button work when UPLOAD_USERDIR is set

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/lib/editpage.php	2022-01-18 15:58:50 UTC (rev 10907)
@@ -980,8 +980,11 @@
         if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
             $image_dir .= "/" . $request->_user->_userid;
             $pd = new ImageOrVideoSet($image_dir, '*');
-            $images = array_merge($images, $pd->getFiles());
+            $userimages = $pd->getFiles();
             unset($pd);
+            foreach ($userimages as $image) {
+                $images[] = $request->_user->_userid . '/' . $image;
+            }
         }
         sort($images);
         if (!empty($images)) {

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 15:58:50 UTC (rev 10907)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:29:05 +0000
+Date: Tue, 18 Jan 2022 16:58:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -17,6 +17,7 @@
 * Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
 * In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* Make the toolbar image button work when ##UPLOAD_USERDIR## is set.
 * blog theme improved.
 
 === Changes ===

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/pgsrc/ReleaseNotes	2022-01-18 15:58:50 UTC (rev 10907)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:29:05 +0000
+Date: Tue, 18 Jan 2022 16:58:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,6 +17,7 @@
 * Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
 * In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* Make the toolbar image button work when ##UPLOAD_USERDIR## is set.
 * blog theme improved.
 
 === Changes ===

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