Changeset 26999 for branches/2.6/admin/include/functions.php

Timestamp:

Jan 27, 2014, 7:05:04 PM (10 years ago)

Author:

mistic100

Message:

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)

File:

• branches/2.6/admin/include/functions.php (modified) (3 diffs)

branches/2.6/admin/include/functions.php

@@ -577 +577 @@
   ORDER BY id_uppercat,rank,name';
 
+  global $cat_map; // used in preg_replace callback
   $cat_map = array();
 
@@ -603 +604 @@
   $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 +625 @@
     }
   }
+
+  unset($cat_map);
 
   mass_updates(