Changeset 25018 for trunk/admin/include/functions.php

Timestamp:

Oct 19, 2013, 7:43:04 PM (11 years ago)

Author:

mistic100

Message:

remove all array_push (50% slower than []) + some changes missing for feature:2978

File:

• trunk/admin/include/functions.php (modified) (13 diffs)

trunk/admin/include/functions.php

@@ -541 +541 @@
             and is_dir($path.'/'.$node))
         {
-          array_push($dirs, $path.'/'.$node);
+          $dirs[] = $path.'/'.$node;
           if ($recursive)
           {
@@ -748 +748 @@
     list($representative) = pwg_db_fetch_row(pwg_query($query));
 
-    array_push(
-      $datas,
-      array(
-        'id' => $category_id,
-        'representative_picture_id' => $representative,
-        )
+    $datas[] = array(
+      'id' => $category_id,
+      'representative_picture_id' => $representative,
       );
   }
@@ -863 +860 @@
             if (basename($path) == 'thumbnail')
             {
-              array_push($fs['thumbnails'], $path.'/'.$node);
+              $fs['thumbnails'][] = $path.'/'.$node;
             }
             else if (basename($path) == 'pwg_representative')
             {
-              array_push($fs['representatives'], $path.'/'.$node);
+              $fs['representatives'][] = $path.'/'.$node;
             }
             else
             {
-              array_push($fs['elements'], $path.'/'.$node);
+              $fs['elements'][] = $path.'/'.$node;
             }
           }
@@ -877 +874 @@
           else if (isset($conf['flip_file_ext'][$extension]))
           {
-            array_push($fs['elements'], $path.'/'.$node);
+            $fs['elements'][] = $path.'/'.$node;
           }
         }
         else if (is_dir($path.'/'.$node) and $node != 'pwg_high' and $recursive)
         {
-          array_push($subdirs, $node);
+          $subdirs[] = $node;
         }
       }
@@ -996 +993 @@
     while ($uppercat)
     {
-      array_push($upper_list, $uppercat);
+      $upper_list[] = $uppercat;
       $uppercat = $cat_map[$uppercat]['id_uppercat'];
     }
@@ -1003 +1000 @@
     if ($new_uppercats != $cat['uppercats'])
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $id,
-          'uppercats' => $new_uppercats
-          )
+      $datas[] = array(
+        'id' => $id,
+        'uppercats' => $new_uppercats
         );
     }
@@ -1096 +1090 @@
       if (preg_match('/^'.$category['uppercats'].'(,|$)/', $new_parent_uppercats))
       {
-        array_push(
-          $page['errors'],
-          l10n('You cannot move an album in its own sub album')
-          );
+        $page['errors'][] = l10n('You cannot move an album in its own sub album');
         return;
       }
@@ -1178 +1169 @@
   }
 
-  array_push(
-    $page['infos'],
-    l10n_dec(
-      '%d album moved', '%d albums moved',
-      count($categories)
-      )
+  $page['infos'][] = l10n_dec(
+    '%d album moved', '%d albums moved',
+    count($categories)
     );
 }
@@ -1308 +1296 @@
     foreach ($granted_grps as $granted_grp)
     {
-      array_push(
-        $inserts,
-        array(
-          'group_id' => $granted_grp,
-          'cat_id' => $inserted_id
-          )
+      $inserts[] = array(
+        'group_id' => $granted_grp,
+        'cat_id' => $inserted_id
         );
     }
@@ -1587 +1572 @@
         $rank = ++$current_rank_of[$category_id];
 
-        array_push(
-          $inserts,
-          array(
-            'image_id' => $image_id,
-            'category_id' => $category_id,
-            'rank' => $rank,
-            )
+        $inserts[] = array(
+          'image_id' => $image_id,
+          'category_id' => $category_id,
+          'rank' => $rank,
           );
       }
@@ -2316 +2298 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($granteds[$row['cat_id']], $row['user_id']);
+    $granteds[ $row['cat_id'] ][] = $row['user_id'];
   }
 
@@ -2327 +2309 @@
     foreach ($grant_to_users as $user_id)
     {
-      array_push(
-        $inserts,
-        array(
-          'user_id' => $user_id,
-          'cat_id' => $cat_id
-          )
+      $inserts[] = array(
+        'user_id' => $user_id,
+        'cat_id' => $cat_id
         );
     }
@@ -2514 +2493 @@
           and $file != '.svn')
       {
-        array_push($sub_dirs, $file);
+        $sub_dirs[] = $file;
       }
     }