From: <var...@us...> - 2014-10-16 10:34:33
|
Revision: 9274 http://sourceforge.net/p/phpwiki/code/9274 Author: vargenau Date: 2014-10-16 10:34:31 +0000 (Thu, 16 Oct 2014) Log Message: ----------- Use imageOrVideoSet Modified Paths: -------------- trunk/lib/EditToolbar.php Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2014-10-16 10:18:36 UTC (rev 9273) +++ trunk/lib/EditToolbar.php 2014-10-16 10:34:31 UTC (rev 9274) @@ -424,12 +424,12 @@ global $WikiTheme, $request; $image_dir = getUploadFilePath(); - $pd = new fileSet($image_dir, '*'); + $pd = new imageOrVideoSet($image_dir, '*'); $images = $pd->getFiles(); unset($pd); if (UPLOAD_USERDIR) { $image_dir .= "/" . $request->_user->_userid; - $pd = new fileSet($image_dir, '*'); + $pd = new imageOrVideoSet($image_dir, '*'); $images = array_merge($images, $pd->getFiles()); unset($pd); } @@ -437,10 +437,7 @@ if (!empty($images)) { $image_js = ''; foreach ($images as $image) { - // Select only image and video files - if (is_image($image) or is_video($image)) { - $image_js .= ",['$image','{{" . $image . "}}']"; - } + $image_js .= ",['$image','{{" . $image . "}}']"; } $image_js = substr($image_js, 1); $more_buttons = HTML::img(array('class' => "toolbar", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |