Merged revision(s) 26904 from branches/2.6:

bug 2989: Deprecated: preg_replace(): The /e modifier is deprecated

git-svn-id: http://piwigo.org/svn/trunk@26905 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-01-22 12:05:27 +00:00
parent 732e0bb497
commit 9ee07221ec

View File

@@ -810,14 +810,18 @@ SELECT id, uppercats, site_id
$categories = array_from_query($query);
// filling $cat_fulldirs
$cat_dirs_callback = create_function('$m', 'global $cat_dirs; return $cat_dirs[$m[1]];');
$cat_fulldirs = array();
foreach ($categories as $category)
{
$uppercats = str_replace(',', '/', $category['uppercats']);
$cat_fulldirs[$category['id']] = $galleries_url[$category['site_id']];
$cat_fulldirs[$category['id']].= preg_replace('/(\d+)/e',
"\$cat_dirs['$1']",
$uppercats);
$cat_fulldirs[$category['id']].= preg_replace_callback(
'/(\d+)/',
$cat_dirs_callback,
$uppercats
);
}
return $cat_fulldirs;