mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-04 16:02:50 +02:00
Merged revision(s) 26972, 26998 from trunk:
replace more preg_replace callback ........ remove *_version_compare methods in languages & plugins & themes classes, unused and outdated (preg_replace /e modifier) git-svn-id: http://piwigo.org/svn/branches/2.6@26999 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -576,6 +576,7 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
ORDER BY id_uppercat,rank,name';
|
||||
|
||||
global $cat_map; // used in preg_replace callback
|
||||
$cat_map = array();
|
||||
|
||||
$current_rank = 0;
|
||||
@@ -602,13 +603,16 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
|
||||
|
||||
$datas = array();
|
||||
|
||||
$cat_map_callback = create_function('$m', 'global $cat_map; return $cat_map[$m[1]]["rank"];');
|
||||
|
||||
foreach( $cat_map as $id=>$cat )
|
||||
{
|
||||
$new_global_rank = preg_replace(
|
||||
'/(\d+)/e',
|
||||
"\$cat_map['$1']['rank']",
|
||||
str_replace(',', '.', $cat['uppercats'] )
|
||||
);
|
||||
$new_global_rank = preg_replace_callback(
|
||||
'/(\d+)/',
|
||||
$cat_map_callback,
|
||||
str_replace(',', '.', $cat['uppercats'] )
|
||||
);
|
||||
|
||||
if ( $cat['rank_changed']
|
||||
or $new_global_rank!=$cat['global_rank']
|
||||
)
|
||||
@@ -621,6 +625,8 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
|
||||
}
|
||||
}
|
||||
|
||||
unset($cat_map);
|
||||
|
||||
mass_updates(
|
||||
CATEGORIES_TABLE,
|
||||
array(
|
||||
|
||||
Reference in New Issue
Block a user