aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include/functions.php
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2014-01-26 00:38:37 +0000
committermistic100 <mistic@piwigo.org>2014-01-26 00:38:37 +0000
commitfae05b2743c514db2c345b2cf53c317af9d5ac5f (patch)
tree342df4daca0751692a2a45091901a1f7418cbf0b /admin/include/functions.php
parent948adde84006257791e5e7239c2c159eeac0d872 (diff)
replace more preg_replace callback
git-svn-id: http://piwigo.org/svn/trunk@26972 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 2060e03b4..31f8b0eba 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -582,6 +582,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;
@@ -608,13 +609,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']
)
@@ -627,6 +631,8 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
}
}
+ unset($cat_map);
+
mass_updates(
CATEGORIES_TABLE,
array(