Changeset 26999 for branches/2.6/admin

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)

Location:

branches/2.6/admin

Files:

• history.php (modified) (3 diffs)
• include/functions.php (modified) (3 diffs)
• include/languages.class.php (modified) (1 diff)
• include/plugins.class.php (modified) (1 diff)
• include/themes.class.php (modified) (1 diff)

branches/2.6/admin/history.php

@@ -340 +340 @@
     name, url_name
   FROM '.TAGS_TABLE;
+
+    global $name_of_tag; // used for preg_replace
     $name_of_tag = array();
     $result = pwg_query($query);
@@ -400 +402 @@
     if (isset($line['tag_ids']))
     {
-      $tags_string = preg_replace(
-        '/(\d+)/e',
-        'isset($name_of_tag["$1"]) ? $name_of_tag["$1"] : "$1"',
+      $tags_string = preg_replace_callback(
+        '/(\d+)/',
+        create_function('$m', 'return isset($name_of_tag[$m[1]]) ? $name_of_tag[$m[1]] : $m[1];'),
         str_replace(
           ',',
@@ -542 +544 @@
       )
     );
+
+  unset($name_of_tag);
 }
 

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(

branches/2.6/admin/include/languages.class.php

@@ -403 +403 @@
    * Sort functions
    */
-  function language_version_compare($a, $b)
-  {
-    $pattern = array('/([a-z])/ei', '/\.+/', '/\.\Z|\A\./');
-    $replacement = array( "'.'.intval('\\1', 36).'.'", '.', '');
-
-    $array = preg_replace($pattern, $replacement, array($a, $b));
-
-    return version_compare($array[0], $array[1], '>=');
-  }
-
   function extension_name_compare($a, $b)
   {

branches/2.6/admin/include/plugins.class.php

@@ -615 +615 @@
    * Sort functions
    */
-  function plugin_version_compare($a, $b)
-  {
-    if (strtolower($a) == 'auto') return false;
-    
-    $array = preg_replace(
-      array('/\.+/', '/\.\Z|\A\./'),
-      array('.', ''),
-      array($a, $b)
-      );
-      
-    $array = preg_replace_callback(
-      '/([a-z])/i',
-      create_function('$m', 'return intval($m[1], 36);'),
-      $array
-      );
-    
-    return version_compare($array[0], $array[1], '>=');
-  }
-
   function extension_revision_compare($a, $b)
   {

branches/2.6/admin/include/themes.class.php

@@ -690 +690 @@
    * Sort functions
    */
-  function theme_version_compare($a, $b)
-  {
-    $pattern = array('/([a-z])/ei', '/\.+/', '/\.\Z|\A\./');
-    $replacement = array( "'.'.intval('\\1', 36).'.'", '.', '');
-
-    $array = preg_replace($pattern, $replacement, array($a, $b));
-
-    return version_compare($array[0], $array[1], '>=');
-  }
-
   function extension_revision_compare($a, $b)
   {