mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Minor inconsistencies in image shortcodes

Browse Source
This commit is contained in:
e107steved
2010-10-28 19:52:11 +00:00
parent 104bed623b
commit fc04350895
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/single/imageselector.php
View File

@@ -60,7 +60,7 @@ function imageselector_shortcode($parm = '', $mod = '')
$recurse = ($subdirs) ? $subdirs : 0; $recurse = ($subdirs) ? $subdirs : 0;
foreach ($paths as $pths) foreach ($paths as $pths)
{ {
$imagelist[$tp->createConstants($pths, 'mix')] = $fl->get_files($pths, '\.jpg|\.gif|\.png|\.JPG|\.GIF|\.PNG', 'standard', $recurse); $imagelist[$tp->createConstants($pths, 'mix')] = $fl->get_files($pths, '\.jpg|\.gif|\.png|\.JPG|\.GIF|\.PNG|\.jpeg|\.JPEG|\.svn|\.SVN', 'standard', $recurse);
} }
if (!$fullpath && (count($paths) > 1)) if (!$fullpath && (count($paths) > 1))

2
e107_core/shortcodes/single/imageselector.sc
View File

@@ -73,7 +73,7 @@ if($scaction == 'select' || $scaction == 'all')
{ {
$dir = str_replace($paths,"",$icon['path']); $dir = str_replace($paths,"",$icon['path']);
if(!$filter || ($filter && ereg($filter,$dir.$icon['fname']))) if (!$filter || ($filter && preg_match('~'.$filter.'~', $dir.$icon['fname'])))
{ {
$pth = ($fullpath) ? $tp->createConstants($icon['path'],'rel') : $dir; $pth = ($fullpath) ? $tp->createConstants($icon['path'],'rel') : $dir;