Index: /trunk/admin/album_notification.php
===================================================================
--- /trunk/admin/album_notification.php	(revision 25017)
+++ /trunk/admin/album_notification.php	(revision 25018)
@@ -114,11 +114,5 @@
   list($group_name) = pwg_db_fetch_row(pwg_query($query));
 
-  array_push(
-    $page['infos'],
-    l10n(
-      'An information email was sent to group "%s"',
-      $group_name
-      )
-    );
+  $page['infos'][] = l10n('An information email was sent to group "%s"', $group_name);
 }
 
Index: /trunk/admin/batch_manager.php
===================================================================
--- /trunk/admin/batch_manager.php	(revision 25017)
+++ /trunk/admin/batch_manager.php	(revision 25018)
@@ -178,8 +178,5 @@
   WHERE user_id = '.$user['id'].'
 ;';
-    array_push(
-      $filter_sets,
-      array_from_query($query, 'element_id')
-      );
+    $filter_sets[] = array_from_query($query, 'element_id');
     
     break;
@@ -191,8 +188,5 @@
   WHERE user_id = '.$user['id'].'
 ;';
-    array_push(
-      $filter_sets,
-      array_from_query($query, 'image_id')
-      );
+    $filter_sets[] = array_from_query($query, 'image_id');
     
     break;
@@ -211,8 +205,5 @@
   WHERE date_available BETWEEN '.pwg_db_get_recent_period_expression(1, $row['date']).' AND \''.$row['date'].'\'
 ;';
-      array_push(
-        $filter_sets,
-        array_from_query($query, 'id')
-        );
+      $filter_sets[] = array_from_query($query, 'id');
     }
     
@@ -243,8 +234,5 @@
     }
 
-    array_push(
-      $filter_sets,
-      array_diff($all_elements, $linked_to_virtual)
-      );
+    $filter_sets[] = array_diff($all_elements, $linked_to_virtual);
     
     break;
@@ -258,8 +246,5 @@
   WHERE category_id is null
 ;';
-    array_push(
-      $filter_sets,
-      array_from_query($query, 'id')
-      );
+    $filter_sets[] = array_from_query($query, 'id');
     
     break;
@@ -273,8 +258,5 @@
   WHERE tag_id is null
 ;';
-    array_push(
-      $filter_sets,
-      array_from_query($query, 'id')
-      );
+    $filter_sets[] = array_from_query($query, 'id');
     
     break;
@@ -298,9 +280,5 @@
   WHERE file IN (\''.implode("','", $duplicate_files).'\')
 ;';
-
-    array_push(
-      $filter_sets,
-      array_from_query($query, 'id')
-      );
+    $filter_sets[] = array_from_query($query, 'id');
     
     break;
@@ -338,8 +316,5 @@
    WHERE category_id IN ('.implode(',', $categories).')
  ;';
-  array_push(
-    $filter_sets,
-    array_from_query($query, 'image_id')
-    );
+  $filter_sets[] = array_from_query($query, 'image_id');
 }
 
@@ -363,13 +338,10 @@
 if (!empty($_SESSION['bulk_manager_filter']['tags']))
 {
-  array_push(
-    $filter_sets,
-    get_image_ids_for_tags(
-      $_SESSION['bulk_manager_filter']['tags'],
-      $_SESSION['bulk_manager_filter']['tag_mode'],
-      null,
-      null,
-      false // we don't apply permissions in administration screens
-      )
+  $filter_sets[] = get_image_ids_for_tags(
+    $_SESSION['bulk_manager_filter']['tags'],
+    $_SESSION['bulk_manager_filter']['tag_mode'],
+    null,
+    null,
+    false // we don't apply permissions in administration screens
     );
 }
Index: /trunk/admin/batch_manager_global.php
===================================================================
--- /trunk/admin/batch_manager_global.php	(revision 25017)
+++ /trunk/admin/batch_manager_global.php	(revision 25018)
@@ -83,5 +83,5 @@
   if (count($collection) == 0)
   {
-    array_push($page['errors'], l10n('Select at least one photo'));
+    $page['errors'][] = l10n('Select at least one photo');
   }
 
@@ -106,5 +106,5 @@
     if (empty($_POST['add_tags']))
     {
-      array_push($page['errors'], l10n('Select at least one tag'));
+      $page['errors'][] = l10n('Select at least one tag');
     }
     else
@@ -134,5 +134,5 @@
      else
      {
-      array_push($page['errors'], l10n('Select at least one tag'));
+      $page['errors'][] = l10n('Select at least one tag');
      }
   }
@@ -242,10 +242,7 @@
     foreach ($collection as $image_id)
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $image_id,
-          'author' => $_POST['author']
-          )
+      $datas[] = array(
+        'id' => $image_id,
+        'author' => $_POST['author']
         );
     }
@@ -269,10 +266,7 @@
     foreach ($collection as $image_id)
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $image_id,
-          'name' => $_POST['title']
-          )
+      $datas[] = array(
+        'id' => $image_id,
+        'name' => $_POST['title']
         );
     }
@@ -303,10 +297,7 @@
     foreach ($collection as $image_id)
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $image_id,
-          'date_creation' => $date_creation
-          )
+      $datas[] = array(
+        'id' => $image_id,
+        'date_creation' => $date_creation
         );
     }
@@ -325,10 +316,7 @@
     foreach ($collection as $image_id)
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $image_id,
-          'level' => $_POST['level']
-          )
+      $datas[] = array(
+        'id' => $image_id,
+        'level' => $_POST['level']
         );
     }
@@ -363,13 +351,7 @@
       if ($deleted_count > 0)
       {
-        $_SESSION['page_infos'] = array(
-          sprintf(
-            l10n_dec(
-              '%d photo was deleted',
-              '%d photos were deleted',
-              $deleted_count
-              ),
-            $deleted_count
-            )
+        $_SESSION['page_infos'][] = l10n_dec(
+          '%d photo was deleted', '%d photos were deleted',
+          $deleted_count
           );
 
@@ -379,10 +361,10 @@
       else
       {
-        array_push($page['errors'], l10n('No photo can be deleted'));
+        $page['errors'][] = l10n('No photo can be deleted');
       }
     }
     else
     {
-      array_push($page['errors'], l10n('You need to confirm deletion'));
+      $page['errors'][] = l10n('You need to confirm deletion');
     }
   }
@@ -392,9 +374,5 @@
   {
     sync_metadata($collection);
-
-    array_push(
-      $page['infos'],
-      l10n('Metadata synchronized from file')
-      );
+    $page['infos'][] = l10n('Metadata synchronized from file');
   }
 
@@ -416,9 +394,11 @@
   {
     if ($_POST['regenerateSuccess'] != '0')
-      array_push($page['infos'], l10n('%s photos have been regenerated', $_POST['regenerateSuccess']));
-
+    {
+      $page['infos'][] = l10n('%s photos have been regenerated', $_POST['regenerateSuccess']);
+    }
     if ($_POST['regenerateError'] != '0')
-      array_push($page['warnings'], l10n('%s photos can not be regenerated', $_POST['regenerateError']));
-
+    {
+      $page['warnings'][] = l10n('%s photos can not be regenerated', $_POST['regenerateError']);
+    }
   }
 
@@ -445,7 +425,5 @@
 if ($conf['enable_synchronization'])
 {
-  array_push($prefilters,
-    array('ID' => 'no_virtual_album', 'NAME' => l10n('With no virtual album'))
-  );
+  $prefilters[] = array('ID' => 'no_virtual_album', 'NAME' => l10n('With no virtual album'));
 }
 
Index: /trunk/admin/batch_manager_unit.php
===================================================================
--- /trunk/admin/batch_manager_unit.php	(revision 25017)
+++ /trunk/admin/batch_manager_unit.php	(revision 25018)
@@ -104,5 +104,5 @@
     }
 
-    array_push($datas, $data);
+    $datas[] = $data;
 
     // tags management
@@ -124,5 +124,5 @@
     );
 
-  array_push($page['infos'], l10n('Photo informations updated'));
+  $page['infos'][] = l10n('Photo informations updated');
 }
 
@@ -233,5 +233,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($element_ids, $row['id']);
+    $element_ids[] = $row['id'];
 
     $src_image = new SrcImage($row);
Index: /trunk/admin/cat_list.php
===================================================================
--- /trunk/admin/cat_list.php	(revision 25017)
+++ /trunk/admin/cat_list.php	(revision 25018)
@@ -79,5 +79,5 @@
     }
     
-    array_push($datas, array('id' => $id, 'rank' => $current_rank));
+    $datas[] = array('id' => $id, 'rank' => $current_rank);
   }
   $fields = array('primary' => array('id'), 'update' => array('rank'));
@@ -134,9 +134,9 @@
   if (isset($output_create['error']))
   {
-    array_push($page['errors'], $output_create['error']);
+    $page['errors'][] = $output_create['error'];
   }
   else
   {
-    array_push($page['infos'], $output_create['info']);
+    $page['infos'][] = $output_create['info'];
   }
 }
@@ -147,8 +147,5 @@
   save_categories_order(array_keys($_POST['catOrd']));
 
-  array_push(
-    $page['infos'],
-    l10n('Album manual order was saved')
-    );
+  $page['infos'][] = l10n('Album manual order was saved');
 }
 else if (isset($_POST['submitAutoOrder']))
@@ -179,15 +176,9 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push(
-      $categories,
-      array(
-        'id' => $row['id'],
-        'id_uppercat' => $row['id_uppercat'],
-        )
+    $categories[] = array(
+      'id' => $row['id'],
+      'id_uppercat' => $row['id_uppercat'],
       );
-    array_push(
-      $names,
-      $row['name']
-      );
+    $names[] = $row['name'];
   }
 
@@ -200,8 +191,5 @@
   save_categories_order($categories);
 
-  array_push(
-    $page['infos'],
-    l10n('Albums automatically sorted')
-    );
+  $page['infos'][] = l10n('Albums automatically sorted');
 }
 
Index: /trunk/admin/cat_move.php
===================================================================
--- /trunk/admin/cat_move.php	(revision 25017)
+++ /trunk/admin/cat_move.php	(revision 25018)
@@ -52,8 +52,5 @@
   else
   {
-    array_push(
-      $page['errors'],
-      l10n('Select at least one album')
-      );
+    $page['errors'][] = l10n('Select at least one album');
   }
 }
Index: /trunk/admin/cat_perm.php
===================================================================
--- /trunk/admin/cat_perm.php	(revision 25017)
+++ /trunk/admin/cat_perm.php	(revision 25018)
@@ -126,5 +126,5 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        array_push($granteds[$row['cat_id']], $row['group_id']);
+        $granteds[ $row['cat_id'] ][] = $row['group_id'];
       }
 
@@ -136,10 +136,7 @@
         foreach ($group_ids as $group_id)
         {
-          array_push(
-            $inserts,
-            array(
-              'group_id' => $group_id,
-              'cat_id' => $cat_id
-              )
+          $inserts[] = array(
+            'group_id' => $group_id,
+            'cat_id' => $cat_id
             );
         }
@@ -191,5 +188,5 @@
   }
 
-  array_push($page['infos'], l10n('Album updated successfully'));
+  $page['infos'][] = l10n('Album updated successfully');
 }
 
@@ -273,9 +270,9 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    if (!isset($granted_groups[$row['group_id']]))
-    {
-      $granted_groups[$row['group_id']] = array();
-    }
-    array_push($granted_groups[$row['group_id']], $row['user_id']);
+    if (!isset($granted_groups[ $row['group_id'] ]))
+    {
+      $granted_groups[ $row['group_id'] ] = array();
+    }
+    $granted_groups[ $row['group_id'] ][] = $row['user_id'];
   }
 
@@ -303,5 +300,5 @@
       if (in_array($user_id, $user_granted_indirect_ids))
       {
-        array_push($group_usernames, $users[$user_id]);
+        $group_usernames[] = $users[$user_id];
       }
     }
Index: /trunk/admin/comments.php
===================================================================
--- /trunk/admin/comments.php	(revision 25017)
+++ /trunk/admin/comments.php	(revision 25018)
@@ -42,8 +42,5 @@
   if (empty($_POST['comments']))
   {
-    array_push(
-      $page['errors'],
-      l10n('Select at least one comment')
-      );
+    $page['errors'][] = l10n('Select at least one comment');
   }
   else
@@ -56,10 +53,7 @@
       validate_user_comment($_POST['comments']);
 
-      array_push(
-        $page['infos'],
-        l10n_dec(
-          '%d user comment validated', '%d user comments validated',
-          count($_POST['comments'])
-          )
+      $page['infos'][] = l10n_dec(
+        '%d user comment validated', '%d user comments validated',
+        count($_POST['comments'])
         );
     }
@@ -69,10 +63,7 @@
       delete_user_comment($_POST['comments']);
 
-      array_push(
-        $page['infos'],
-        l10n_dec(
-          '%d user comment rejected', '%d user comments rejected',
-          count($_POST['comments'])
-          )
+      $page['infos'][] = l10n_dec(
+        '%d user comment rejected', '%d user comments rejected',
+        count($_POST['comments'])
         );
     }
@@ -149,5 +140,5 @@
     );
 
-  array_push($list, $row['id']);
+  $list[] = $row['id'];
 }
 
Index: /trunk/admin/configuration.php
===================================================================
--- /trunk/admin/configuration.php	(revision 25017)
+++ /trunk/admin/configuration.php	(revision 25018)
@@ -155,5 +155,5 @@
           if ( !count($_POST['order_by']) )
           {
-            array_push($page['errors'], l10n('No order field selected'));
+            $page['errors'][] = l10n('No order field selected');
           }
           else
@@ -180,5 +180,5 @@
         else
         {
-          array_push($page['errors'], l10n('No order field selected'));
+          $page['errors'][] = l10n('No order field selected');
         }
       }
@@ -208,5 +208,5 @@
            or $_POST['nb_comment_page'] > 50)
       {
-        array_push($page['errors'], l10n('The number of comments a page must be between 5 and 50 included.'));
+        $page['errors'][] = l10n('The number of comments a page must be between 5 and 50 included.');
       }
       foreach( $comments_checkboxes as $checkbox)
@@ -226,5 +226,5 @@
             or $_POST['nb_categories_page'] < 4)
       {
-        array_push($page['errors'], l10n('The number of albums a page must be above 4.'));
+        $page['errors'][] = l10n('The number of albums a page must be above 4.');
       }
       foreach( $display_checkboxes as $checkbox)
@@ -269,5 +269,5 @@
       }
     }
-    array_push($page['infos'], l10n('Information data registered in database'));
+    $page['infos'][] = l10n('Information data registered in database');
   }
 
@@ -283,8 +283,5 @@
   clear_derivative_cache();
 
-  array_push(
-    $page['infos'],
-    l10n('Your configuration settings are saved')
-    );
+  $page['infos'][] = l10n('Your configuration settings are saved');
 }
 
@@ -325,5 +322,5 @@
     if (order_by_is_local())
     {
-      array_push($page['warnings'], l10n('You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'));
+      $page['warnings'][] = l10n('You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !');
     }
 
@@ -401,5 +398,5 @@
       // Reload user
       $edit_user = build_user($conf['guest_id'], false);
-      array_push($page['infos'], l10n('Information data registered in database'));
+      $page['infos'][] = l10n('Information data registered in database');
     }
     $page['errors'] = array_merge($page['errors'], $errors);
Index: /trunk/admin/element_set_ranks.php
===================================================================
--- /trunk/admin/element_set_ranks.php	(revision 25017)
+++ /trunk/admin/element_set_ranks.php	(revision 25018)
@@ -65,11 +65,8 @@
   foreach ($images as $id)
   {
-    array_push(
-      $datas,
-      array(
-        'category_id' => $category_id,
-        'image_id' => $id,
-        'rank' => ++$current_rank,
-        )
+    $datas[] = array(
+      'category_id' => $category_id,
+      'image_id' => $id,
+      'rank' => ++$current_rank,
       );
   }
@@ -99,8 +96,5 @@
       );
 
-    array_push(
-      $page['infos'],
-      l10n('Images manual order was saved')
-      );
+    $page['infos'][] = l10n('Images manual order was saved');
   }
 
@@ -144,5 +138,5 @@
   }
 
-  array_push($page['infos'], l10n('Your configuration settings are saved'));
+  $page['infos'][] = l10n('Your configuration settings are saved');
 }
 
Index: /trunk/admin/extend_for_templates.php
===================================================================
--- /trunk/admin/extend_for_templates.php	(revision 25017)
+++ /trunk/admin/extend_for_templates.php	(revision 25018)
@@ -150,6 +150,5 @@
   if (pwg_query($query))
   {
-    array_push($page['infos'], 
-      l10n('Templates configuration has been recorded.'));
+    $page['infos'][] = l10n('Templates configuration has been recorded.');
   }
 }
Index: /trunk/admin/group_list.php
===================================================================
--- /trunk/admin/group_list.php	(revision 25017)
+++ /trunk/admin/group_list.php	(revision 25018)
@@ -46,5 +46,5 @@
   if (empty($_POST['groupname']))
   {
-    array_push($page['errors'], l10n('The name of a group must not contain " or \' or be empty.'));
+    $page['errors'][] = l10n('The name of a group must not contain " or \' or be empty.');
   }
   if (count($page['errors']) == 0)
@@ -59,5 +59,5 @@
     if ($count != 0)
     {
-      array_push($page['errors'], l10n('This name is already used by another group.'));
+      $page['errors'][] = l10n('This name is already used by another group.');
     }
   }
@@ -87,5 +87,5 @@
   if (count($groups) == 0)
   {
-    array_push($page['errors'], l10n('Select at least one group'));
+    $page['errors'][] = l10n('Select at least one group');
   }
 
@@ -170,5 +170,5 @@
     if ($count != 0)
     {
-      array_push($page['errors'], l10n('This name is already used by another group.'));
+      $page['errors'][] = l10n('This name is already used by another group.');
     }
     else
@@ -256,5 +256,5 @@
       if ($count != 0)
       {
-        array_push($page['errors'], l10n('This name is already used by another group.'));
+        $page['errors'][] = l10n('This name is already used by another group.');
         break;
       }
Index: /trunk/admin/group_perm.php
===================================================================
--- /trunk/admin/group_perm.php	(revision 25017)
+++ /trunk/admin/group_perm.php	(revision 25018)
@@ -82,5 +82,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($private_uppercats, $row['id']);
+    $private_uppercats[] = $row['id'];
   }
 
@@ -99,5 +99,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($authorized_ids, $row['cat_id']);
+    $authorized_ids[] = $row['cat_id'];
   }
 
@@ -106,10 +106,7 @@
   foreach ($to_autorize_ids as $to_autorize_id)
   {
-    array_push(
-      $inserts,
-      array(
-        'group_id' => $page['group'],
-        'cat_id' => $to_autorize_id
-        )
+    $inserts[] = array(
+      'group_id' => $page['group'],
+      'cat_id' => $to_autorize_id
       );
   }
@@ -159,5 +156,5 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  array_push($authorized_ids, $row['id']);
+  $authorized_ids[] = $row['id'];
 }
 
Index: /trunk/admin/history.php
===================================================================
--- /trunk/admin/history.php	(revision 25017)
+++ /trunk/admin/history.php	(revision 25018)
@@ -165,5 +165,5 @@
   else
   {
-    array_push($page['errors'], l10n('Empty query. No criteria has been entered.'));
+    $page['errors'][] = l10n('Empty query. No criteria has been entered.');
   }
 }
Index: /trunk/admin/include/check_integrity.class.php
===================================================================
--- /trunk/admin/include/check_integrity.class.php	(revision 25017)
+++ /trunk/admin/include/check_integrity.class.php	(revision 25018)
@@ -72,7 +72,8 @@
     if (count($this->retrieve_list) > 0)
     {
-      $header_notes[] =
-        l10n_dec('%d anomaly has been detected.', '%d anomalies have been detected.',
-          count($this->retrieve_list));
+      $header_notes[] = l10n_dec(
+        '%d anomaly has been detected.', '%d anomalies have been detected.',
+        count($this->retrieve_list)
+        );
     }
 
@@ -117,13 +118,15 @@
       if ($corrected_count > 0)
       {
-        $page['infos'][] =
-          l10n_dec('%d anomaly has been corrected.', '%d anomalies have been detected corrected.',
-            $corrected_count);
+        $page['infos'][] = l10n_dec(
+          '%d anomaly has been corrected.', '%d anomalies have been detected corrected.',
+          $corrected_count
+          );
       }
       if ($not_corrected_count > 0)
       {
-        $page['errors'][] =
-          l10n_dec('%d anomaly has not been corrected.', '%d anomalies have not been corrected.',
-            $not_corrected_count);
+        $page['errors'][] = l10n_dec(
+          '%d anomaly has not been corrected.', '%d anomalies have not been corrected.',
+          $not_corrected_count
+          );
       }
     }
@@ -146,7 +149,8 @@
         if ($ignored_count > 0)
         {
-          $page['infos'][] =
-            l10n_dec('%d anomaly has been ignored.', '%d anomalies have been ignored.',
-              $ignored_count);
+          $page['infos'][] = l10n_dec(
+            '%d anomaly has been ignored.', '%d anomalies have been ignored.',
+            $ignored_count
+            );
         }
       }
Index: /trunk/admin/include/configuration_sizes_process.inc.php
===================================================================
--- /trunk/admin/include/configuration_sizes_process.inc.php	(revision 25017)
+++ /trunk/admin/include/configuration_sizes_process.inc.php	(revision 25018)
@@ -255,8 +255,5 @@
   }
 
-  array_push(
-    $page['infos'],
-    l10n('Your configuration settings are saved')
-    );
+  $page['infos'][] = l10n('Your configuration settings are saved');
 }
 else
Index: /trunk/admin/include/configuration_watermark_process.inc.php
===================================================================
--- /trunk/admin/include/configuration_watermark_process.inc.php	(revision 25017)
+++ /trunk/admin/include/configuration_watermark_process.inc.php	(revision 25018)
@@ -175,8 +175,5 @@
   }
 
-  array_push(
-    $page['infos'],
-    l10n('Your configuration settings are saved')
-    );
+  $page['infos'][] = l10n('Your configuration settings are saved');
 }
 else
Index: /trunk/admin/include/functions.php
===================================================================
--- /trunk/admin/include/functions.php	(revision 25017)
+++ /trunk/admin/include/functions.php	(revision 25018)
@@ -541,5 +541,5 @@
             and is_dir($path.'/'.$node))
         {
-          array_push($dirs, $path.'/'.$node);
+          $dirs[] = $path.'/'.$node;
           if ($recursive)
           {
@@ -748,10 +748,7 @@
     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,13 +860,13 @@
             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,10 +874,10 @@
           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,5 +993,5 @@
     while ($uppercat)
     {
-      array_push($upper_list, $uppercat);
+      $upper_list[] = $uppercat;
       $uppercat = $cat_map[$uppercat]['id_uppercat'];
     }
@@ -1003,10 +1000,7 @@
     if ($new_uppercats != $cat['uppercats'])
     {
-      array_push(
-        $datas,
-        array(
-          'id' => $id,
-          'uppercats' => $new_uppercats
-          )
+      $datas[] = array(
+        'id' => $id,
+        'uppercats' => $new_uppercats
         );
     }
@@ -1096,8 +1090,5 @@
       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,10 +1169,7 @@
   }
 
-  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,10 +1296,7 @@
     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,11 +1572,8 @@
         $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,5 +2298,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($granteds[$row['cat_id']], $row['user_id']);
+    $granteds[ $row['cat_id'] ][] = $row['user_id'];
   }
 
@@ -2327,10 +2309,7 @@
     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,5 +2493,5 @@
           and $file != '.svn')
       {
-        array_push($sub_dirs, $file);
+        $sub_dirs[] = $file;
       }
     }
Index: /trunk/admin/include/functions_history.inc.php
===================================================================
--- /trunk/admin/include/functions_history.inc.php	(revision 25017)
+++ /trunk/admin/include/functions_history.inc.php	(revision 25018)
@@ -59,16 +59,10 @@
   if (isset($search['fields']['date-after']))
   {
-    array_push(
-      $clauses,
-      "date >= '".$search['fields']['date-after']."'"
-      );
+    $clauses[] = "date >= '".$search['fields']['date-after']."'";
   }
 
   if (isset($search['fields']['date-before']))
   {
-    array_push(
-      $clauses,
-      "date <= '".$search['fields']['date-before']."'"
-      );
+    $clauses[] = "date <= '".$search['fields']['date-before']."'";
   }
 
@@ -89,5 +83,5 @@
         }
         
-        array_push($local_clauses, $clause);
+        $local_clauses[] = $clause;
       }
     }
@@ -95,8 +89,5 @@
     if (count($local_clauses) > 0)
     {
-      array_push(
-        $clauses,
-        implode(' OR ', $local_clauses)
-        );
+      $clauses[] = implode(' OR ', $local_clauses);
     }
   }
@@ -105,16 +96,10 @@
       and $search['fields']['user'] != -1)
   {
-    array_push(
-      $clauses,
-      'user_id = '.$search['fields']['user']
-      );
+    $clauses[] = 'user_id = '.$search['fields']['user'];
   }
 
   if (isset($search['fields']['image_id']))
   {
-    array_push(
-      $clauses,
-      'image_id = '.$search['fields']['image_id']
-      );
+    $clauses[] = 'image_id = '.$search['fields']['image_id'];
   }
   
@@ -124,12 +109,9 @@
     {
       // a clause that is always false
-      array_push($clauses, '1 = 2 ');
+      $clauses[] = '1 = 2 ';
     }
     else
     {
-      array_push(
-        $clauses,
-        'image_id IN ('.implode(', ', $search['image_ids']).')'
-        );
+      $clauses[] = 'image_id IN ('.implode(', ', $search['image_ids']).')';
     }
   }
@@ -169,5 +151,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($data, $row);
+    $data[] = $row;
   }
 
Index: /trunk/admin/include/functions_install.inc.php
===================================================================
--- /trunk/admin/include/functions_install.inc.php	(revision 25017)
+++ /trunk/admin/include/functions_install.inc.php	(revision 25018)
@@ -97,5 +97,5 @@
   catch (Exception $e)
   {
-    array_push( $errors, l10n($e->getMessage()));
+    $errors[] = l10n($e->getMessage());
   }
 }
Index: /trunk/admin/include/functions_metadata.php
===================================================================
--- /trunk/admin/include/functions_metadata.php	(revision 25017)
+++ /trunk/admin/include/functions_metadata.php	(revision 25018)
@@ -220,8 +220,5 @@
         foreach (explode(',', $data[$key]) as $tag_name)
         {
-          array_push(
-            $tags_of[$id],
-            tag_id_from_tag_name($tag_name)
-            );
+          $tags_of[$id][] = tag_id_from_tag_name($tag_name);
         }
       }
@@ -230,5 +227,5 @@
     $data['date_metadata_update'] = CURRENT_DATE;
 
-    array_push($datas, $data);
+    $datas[] = $data;
   }
 
@@ -236,5 +233,5 @@
   {
     $update_fields = get_sync_metadata_attributes();
-    array_push($update_fields, 'date_metadata_update');
+    $update_fields[] = 'date_metadata_update';
 
     $update_fields = array_diff(
@@ -298,5 +295,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($cat_ids, $row['id']);
+    $cat_ids[] = $row['id'];
   }
 
Index: /trunk/admin/include/functions_notification_by_mail.inc.php
===================================================================
--- /trunk/admin/include/functions_notification_by_mail.inc.php	(revision 25017)
+++ /trunk/admin/include/functions_notification_by_mail.inc.php	(revision 25018)
@@ -170,5 +170,5 @@
       while ($nbm_user = pwg_db_fetch_assoc($result))
       {
-        array_push($data_users, $nbm_user);
+        $data_users[] = $nbm_user;
       }
     }
@@ -286,5 +286,5 @@
 
   $env_nbm['sent_mail_count'] += 1;
-  array_push($page['infos'], sprintf($env_nbm['msg_info'], stripslashes($nbm_user['username']), $nbm_user['mail_address']));
+  $page['infos'][] = sprintf($env_nbm['msg_info'], stripslashes($nbm_user['username']), $nbm_user['mail_address']);
 }
 
@@ -299,5 +299,5 @@
 
   $env_nbm['error_on_mail_count'] += 1;
-  array_push($page['errors'], sprintf($env_nbm['msg_error'], stripslashes($nbm_user['username']), $nbm_user['mail_address']));
+  $page['errors'][] = sprintf($env_nbm['msg_error'], stripslashes($nbm_user['username']), $nbm_user['mail_address']);
 }
 
@@ -313,14 +313,30 @@
   if ($env_nbm['error_on_mail_count'] != 0)
   {
-    array_push($page['errors'], l10n_dec('%d mail was not sent.', '%d mails were not sent.', $env_nbm['error_on_mail_count']));
+    $page['errors'][] = l10n_dec(
+      '%d mail was not sent.', '%d mails were not sent.',
+      $env_nbm['error_on_mail_count']
+      );
+      
     if ($env_nbm['sent_mail_count'] != 0)
-      array_push($page['infos'], l10n_dec('%d mail was sent.', '%d mails were sent.', $env_nbm['sent_mail_count']));
+    {
+      $page['infos'][] = l10n_dec(
+        '%d mail was sent.', '%d mails were sent.',
+        $env_nbm['sent_mail_count']
+        );
+    }
   }
   else
   {
     if ($env_nbm['sent_mail_count'] == 0)
-      array_push($page['infos'], l10n('No mail to send.'));
+    {
+      $page['infos'][] = l10n('No mail to send.');
+    }
     else
-      array_push($page['infos'], l10n_dec('%d mail was sent.', '%d mails were sent.', $env_nbm['sent_mail_count']));
+    {
+      $page['infos'][] = l10n_dec(
+        '%d mail was sent.', '%d mails were sent.',
+        $env_nbm['sent_mail_count']
+        );
+    }
   }
 }
@@ -395,10 +411,10 @@
       {
         // Stop fill list on 'send', if the quota is override
-        array_push($page['errors'], $msg_break_timeout);
+        $page['errors'][] = $msg_break_timeout;
         break;
       }
 
       // Fill return list
-      array_push($check_key_treated, $nbm_user['check_key']);
+      $check_key_treated[] = $nbm_user['check_key'];
 
       $do_update = true;
@@ -454,20 +470,15 @@
       if ($do_update)
       {
-        array_push
-        (
-          $updates,
-          array
-          (
-            'check_key' => $nbm_user['check_key'],
-            'enabled' => $enabled_value
-          )
-        );
+        $updates[] = array(
+          'check_key' => $nbm_user['check_key'],
+          'enabled' => $enabled_value
+          );
         $updated_data_count += 1;
-        array_push($page['infos'], sprintf($msg_info, stripslashes($nbm_user['username']), $nbm_user['mail_address']));
+        $page['infos'][] = sprintf($msg_info, stripslashes($nbm_user['username']), $nbm_user['mail_address']);
       }
       else
       {
         $error_on_updated_data_count += 1;
-        array_push($page['errors'], sprintf($msg_error, stripslashes($nbm_user['username']), $nbm_user['mail_address']));
+        $page['errors'][] = sprintf($msg_error, stripslashes($nbm_user['username']), $nbm_user['mail_address']);
       }
 
@@ -490,11 +501,15 @@
   }
 
-  array_push($page['infos'], l10n_dec('%d user was updated.', '%d users were updated.', $updated_data_count));
+  $page['infos'][] = l10n_dec(
+    '%d user was updated.', '%d users were updated.',
+    $updated_data_count
+    );
+  
   if ($error_on_updated_data_count != 0)
   {
-    array_push($page['errors'],
-      l10n_dec('%d user was not updated.',
-               '%d users were not updated.',
-               $error_on_updated_data_count));
+    $page['errors'][] = l10n_dec(
+      '%d user was not updated.', '%d users were not updated.',
+      $error_on_updated_data_count
+      );
   }
 
Index: /trunk/admin/include/functions_plugins.inc.php
===================================================================
--- /trunk/admin/include/functions_plugins.inc.php	(revision 25017)
+++ /trunk/admin/include/functions_plugins.inc.php	(revision 25018)
@@ -40,5 +40,5 @@
   else if (isset($page['errors']))
   {
-    array_push($page['errors'], 'PLUGIN ERROR: "'.$file.'" is not a valid file');
+    $page['errors'][] = 'PLUGIN ERROR: "'.$file.'" is not a valid file';
   }
   return $url;
Index: /trunk/admin/include/functions_upgrade.php
===================================================================
--- /trunk/admin/include/functions_upgrade.php	(revision 25017)
+++ /trunk/admin/include/functions_upgrade.php	(revision 25018)
@@ -94,5 +94,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($plugins, $row['id']);
+    $plugins[] = $row['id'];
   }
 
@@ -106,6 +106,6 @@
     pwg_query($query);
 
-    array_push($page['infos'],
-      l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:').'<p><i>'.implode(', ', $plugins).'</i></p>');
+    $page['infos'][] = l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:')
+                        .'<p><i>'.implode(', ', $plugins).'</i></p>';
   }
 }
@@ -136,6 +136,6 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($theme_ids, $row['id']);
-    array_push($theme_names, $row['name']);
+    $theme_ids[] = $row['id'];
+    $theme_names[] = $row['name'];
   }
 
@@ -149,6 +149,6 @@
     pwg_query($query);
 
-    array_push($page['infos'],
-      l10n('As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:').'<p><i>'.implode(', ', $theme_names).'</i></p>');
+    $page['infos'][] = l10n('As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:')
+                        .'<p><i>'.implode(', ', $theme_names).'</i></p>';
 
     // what is the default theme?
@@ -250,9 +250,9 @@
   if (!$conf['password_verify']($password, $row['password']))
   {
-    array_push($page['errors'], l10n('Invalid password!'));
+    $page['errors'][] = l10n('Invalid password!');
   }
   elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster')
   {
-    array_push($page['errors'], l10n('You do not have access rights to run upgrade'));
+    $page['errors'][] = l10n('You do not have access rights to run upgrade');
   }
   else
@@ -280,5 +280,5 @@
           and preg_match('/^(.*?)-database\.php$/', $node, $match))
       {
-        array_push($available_upgrade_ids, $match[1]);
+        $available_upgrade_ids[] = $match[1];
       }
     }
Index: /trunk/admin/include/functions_upload.inc.php
===================================================================
--- /trunk/admin/include/functions_upload.inc.php	(revision 25017)
+++ /trunk/admin/include/functions_upload.inc.php	(revision 25018)
@@ -123,11 +123,7 @@
       else
       {
-        array_push(
-          $errors,
-          sprintf(
-            $upload_form_config[$field]['error_message'],
-            $min,
-            $max
-            )
+        $errors[] = sprintf(
+          $upload_form_config[$field]['error_message'],
+          $min, $max
           );
         
@@ -495,14 +491,5 @@
 function add_upload_error($upload_id, $error_message)
 {
-  if (!isset($_SESSION['uploads_error']))
-  {
-    $_SESSION['uploads_error'] = array();
-  }
-  if (!isset($_SESSION['uploads_error'][$upload_id]))
-  {
-    $_SESSION['uploads_error'][$upload_id] = array();
-  }
-
-  array_push($_SESSION['uploads_error'][$upload_id], $error_message);
+  $_SESSION['uploads_error'][$upload_id][] = $error_message;
 }
 
Index: /trunk/admin/include/languages.class.php
===================================================================
--- /trunk/admin/include/languages.class.php	(revision 25017)
+++ /trunk/admin/include/languages.class.php	(revision 25018)
@@ -58,5 +58,5 @@
         if (isset($crt_db_language))
         {
-          array_push($errors, 'CANNOT ACTIVATE - LANGUAGE IS ALREADY ACTIVATED');
+          $errors[] = 'CANNOT ACTIVATE - LANGUAGE IS ALREADY ACTIVATED';
           break;
         }
@@ -75,5 +75,5 @@
         if (!isset($crt_db_language))
         {
-          array_push($errors, 'CANNOT DEACTIVATE - LANGUAGE IS ALREADY DEACTIVATED');
+          $errors[] = 'CANNOT DEACTIVATE - LANGUAGE IS ALREADY DEACTIVATED';
           break;
         }
@@ -81,5 +81,5 @@
         if ($language_id == get_default_language())
         {
-          array_push($errors, 'CANNOT DEACTIVATE - LANGUAGE IS DEFAULT LANGUAGE');
+          $errors[] = 'CANNOT DEACTIVATE - LANGUAGE IS DEFAULT LANGUAGE';
           break;
         }
@@ -96,10 +96,10 @@
         if (!empty($crt_db_language))
         {
-          array_push($errors, 'CANNOT DELETE - LANGUAGE IS ACTIVATED');
+          $errors[] = 'CANNOT DELETE - LANGUAGE IS ACTIVATED';
           break;
         }
         if (!isset($this->fs_languages[$language_id]))
         {
-          array_push($errors, 'CANNOT DELETE - LANGUAGE DOES NOT EXIST');
+          $errors[] = 'CANNOT DELETE - LANGUAGE DOES NOT EXIST';
           break;
         }
@@ -369,5 +369,5 @@
                   and !empty($old_files))
                 {
-                  array_push($old_files, 'obsolete.list');
+                  $old_files[] = 'obsolete.list';
                   foreach($old_files as $old_file)
                   {
Index: /trunk/admin/include/photos_add_direct_prepare.inc.php
===================================================================
--- /trunk/admin/include/photos_add_direct_prepare.inc.php	(revision 25017)
+++ /trunk/admin/include/photos_add_direct_prepare.inc.php	(revision 25018)
@@ -210,10 +210,10 @@
 if (!empty($error_message))
 {
-  array_push($setup_errors, $error_message);
+  $setup_errors[] = $error_message;
 }
 
 if (!function_exists('gd_info'))
 {
-  array_push($setup_errors, l10n('GD library is missing'));
+  $setup_errors[] = l10n('GD library is missing');
 }
 
@@ -236,19 +236,13 @@
   if ($conf['use_exif'] and !function_exists('read_exif_data'))
   {
-    array_push(
-      $setup_warnings,
-      l10n('Exif extension not available, admin should disable exif use')
-      );
+    $setup_warnings[] = l10n('Exif extension not available, admin should disable exif use');
   }
 
   if (get_ini_size('upload_max_filesize') > get_ini_size('post_max_size'))
   {
-    array_push(
-      $setup_warnings,
-      sprintf(
-        l10n('In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'),
-        get_ini_size('upload_max_filesize', false),
-        get_ini_size('post_max_size', false)
-        )
+    $setup_warnings[] = l10n(
+      'In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting',
+      get_ini_size('upload_max_filesize', false),
+      get_ini_size('post_max_size', false)
       );
   }
Index: /trunk/admin/include/photos_add_direct_process.inc.php
===================================================================
--- /trunk/admin/include/photos_add_direct_process.inc.php	(revision 25017)
+++ /trunk/admin/include/photos_add_direct_process.inc.php	(revision 25018)
@@ -35,10 +35,7 @@
   if (!isset($_POST['submit_upload']))
   {
-    array_push(
-      $page['errors'],
-      sprintf(
-        l10n('The uploaded files exceed the post_max_size directive in php.ini: %sB'),
-        ini_get('post_max_size')
-        )
+    $page['errors'][] = l10n(
+      'The uploaded files exceed the post_max_size directive in php.ini: %sB',
+      ini_get('post_max_size')
       );
   }
@@ -52,5 +49,5 @@
     foreach ($_POST['onUploadError'] as $error)
     {
-      array_push($page['errors'], $error);
+      $page['errors'][] = $error;
     }
   }
@@ -98,12 +95,9 @@
             if (is_valid_image_extension(pathinfo($node['filename'], PATHINFO_EXTENSION)))
             {
-              array_push($indexes_to_extract, $node['index']);
+              $indexes_to_extract[] = $node['index'];
               
-              array_push(
-                $images_to_add,
-                array(
-                  'source_filepath' => $upload_dir.'/'.$temporary_archive_name.'/'.$node['filename'],
-                  'original_filename' => basename($node['filename']),
-                  )
+              $images_to_add[] = array(
+                'source_filepath' => $upload_dir.'/'.$temporary_archive_name.'/'.$node['filename'],
+                'original_filename' => basename($node['filename']),
                 );
             }
@@ -122,10 +116,7 @@
       elseif (is_valid_image_extension($extension))
       {
-        array_push(
-          $images_to_add,
-          array(
-            'source_filepath' => $_FILES['image_upload']['tmp_name'][$idx],
-            'original_filename' => $_FILES['image_upload']['name'][$idx],
-            )
+        $images_to_add[] = array(
+          'source_filepath' => $_FILES['image_upload']['tmp_name'][$idx],
+          'original_filename' => $_FILES['image_upload']['name'][$idx],
           );
       }
@@ -140,5 +131,5 @@
           );
 
-        array_push($image_ids, $image_id);
+        $image_ids[] = $image_id;
 
         // TODO: if $image_id is not an integer, something went wrong
@@ -149,11 +140,8 @@
       $error_message = file_upload_error_message($error);
       
-      array_push(
-        $page['errors'],
-        sprintf(
-          l10n('Error on file "%s" : %s'),
-          $_FILES['image_upload']['name'][$idx],
-          $error_message
-          )
+      $page['errors'][] = l10n(
+        'Error on file "%s" : %s',
+        $_FILES['image_upload']['name'][$idx],
+        $error_message
         );
     }
@@ -173,5 +161,5 @@
       foreach ($_SESSION['uploads_error'][ $_POST['upload_id'] ] as $error)
       {
-        array_push($page['errors'], $error);
+        $page['errors'][] = $error;
       }
     }
@@ -217,27 +205,16 @@
     $thumbnail['link'] = get_root_url().'admin.php?page=photo-'.$image_id.'&amp;cat_id='.$category_id;
 
-    array_push($page['thumbnails'], $thumbnail);
+    $page['thumbnails'][] = $thumbnail;
   }
   
   if (!empty($page['thumbnails']))
   {
-    array_push(
-      $page['infos'],
-      sprintf(
-        l10n('%d photos uploaded'),
-        count($page['thumbnails'])
-        )
-      );
+    $page['infos'][] = l10n('%d photos uploaded', count($page['thumbnails']));
     
     if (0 != $_POST['level'])
     {
-      array_push(
-        $page['infos'],
-        sprintf(
-          l10n('Privacy level set to "%s"'),
-          l10n(
-            sprintf('Level %d', $_POST['level'])
-            )
-          )
+      $page['infos'][] = l10n(
+        'Privacy level set to "%s"',
+        l10n(sprintf('Level %d', $_POST['level']))
         );
     }
@@ -253,11 +230,8 @@
     
     // information
-    array_push(
-      $page['infos'],
-      sprintf(
-        l10n('Album "%s" now contains %d photos'),
-        '<em>'.$category_name.'</em>',
-        $count
-        )
+    $page['infos'][] = l10n(
+      'Album "%s" now contains %d photos',
+      '<em>'.$category_name.'</em>',
+      $count
       );
     
Index: /trunk/admin/include/plugins.class.php
===================================================================
--- /trunk/admin/include/plugins.class.php	(revision 25017)
+++ /trunk/admin/include/plugins.class.php	(revision 25018)
@@ -400,5 +400,5 @@
           $server_plugins[$plugin['extension_id']] = array();
         }
-        array_push($server_plugins[$plugin['extension_id']], $plugin['revision_name']);
+        $server_plugins[$plugin['extension_id']][] = $plugin['revision_name'];
       }
 
@@ -504,5 +504,5 @@
                 and !empty($old_files))
               {
-                array_push($old_files, 'obsolete.list');
+                $old_files[] = 'obsolete.list';
                 foreach($old_files as $old_file)
                 {
Index: /trunk/admin/include/themes.class.php
===================================================================
--- /trunk/admin/include/themes.class.php	(revision 25017)
+++ /trunk/admin/include/themes.class.php	(revision 25018)
@@ -78,10 +78,7 @@
         if (isset($missing_parent))
         {
-          array_push(
-            $errors,
-            sprintf(
-              l10n('Impossible to activate this theme, the parent theme is missing: %s'),
-              $missing_parent
-              )
+          $errors[] = l10n(
+            'Impossible to activate this theme, the parent theme is missing: %s',
+            $missing_parent
             );
 
@@ -94,5 +91,5 @@
             and $conf['mobile_theme'] != $theme_id)
         {
-          array_push($errors, l10n('You can activate only one mobile theme.'));
+          $errors[] = l10n('You can activate only one mobile theme.');
           break;
         }
@@ -135,8 +132,5 @@
         if (count($this->db_themes_by_id) <= 1)
         {
-          array_push(
-            $errors,
-            l10n('Impossible to deactivate this theme, you need at least one theme.')
-            );
+          $errors[] = l10n('Impossible to deactivate this theme, you need at least one theme.');
           break;
         }
@@ -191,5 +185,5 @@
         if (!empty($crt_db_theme))
         {
-          array_push($errors, 'CANNOT DELETE - THEME IS INSTALLED');
+          $errors[] = 'CANNOT DELETE - THEME IS INSTALLED';
           break;
         }
@@ -203,10 +197,7 @@
         if (count($children) > 0)
         {
-          array_push(
-            $errors,
-            sprintf(
-              l10n('Impossible to delete this theme. Other themes depends on it: %s'),
-              implode(', ', $children)
-              )
+          $errors[] = l10n(
+            'Impossible to delete this theme. Other themes depends on it: %s',
+            implode(', ', $children)
             );
           break;
@@ -263,5 +254,5 @@
       if (isset($test_child['parent']) and $test_child['parent'] == $theme_id)
       {
-        array_push($children, $test_child['name']);
+        $children[] = $test_child['name'];
       }
     }
@@ -323,5 +314,5 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push($themes, $row);
+      $themes[] = $row;
     }
     return $themes;
@@ -629,5 +620,5 @@
                 and !empty($old_files))
               {
-                array_push($old_files, 'obsolete.list');
+                $old_files[] = 'obsolete.list';
                 foreach($old_files as $old_file)
                 {
Index: /trunk/admin/include/updates.class.php
===================================================================
--- /trunk/admin/include/updates.class.php	(revision 25017)
+++ /trunk/admin/include/updates.class.php	(revision 25018)
@@ -162,5 +162,5 @@
             if (in_array($ext_id, $conf['updates_ignored'][$type]))
             {
-              array_push($ignore_list, $ext_id);
+              $ignore_list[] = $ext_id;
             }
             else
@@ -249,5 +249,5 @@
       and !empty($old_files))
     {
-      array_push($old_files, $file);
+      $old_files[] = $file;
       foreach($old_files as $old_file)
       {
@@ -315,5 +315,5 @@
     else
     {
-      array_push($page['errors'], l10n('Unable to dump database.'));
+      $page['errors'][] = l10n('Unable to dump database.');
     }
   }
@@ -415,5 +415,6 @@
             if ($step == 2)
             {
-              array_push($page['infos'], l10n('Update Complete'), $upgrade_to);
+              $page['infos'][] = l10n('Update Complete');
+              $page['infos'][] = $upgrade_to;
               $step = -1;
             }
@@ -426,11 +427,9 @@
           {
             file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'update/log_error.txt', $error);
-            array_push(
-              $page['errors'],
-              sprintf(
-                l10n('An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'),
-                get_root_url().$conf['data_location'].'update/log_error.txt'
-              )
-            );
+            
+            $page['errors'][] = l10n(
+              'An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.',
+              get_root_url().$conf['data_location'].'update/log_error.txt'
+              );
           }
         }
@@ -438,10 +437,10 @@
         {
           deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
-          array_push($page['errors'], l10n('An error has occured during upgrade.'));
+          $page['errors'][] = l10n('An error has occured during upgrade.');
         }
       }
       else
       {
-        array_push($page['errors'], l10n('Piwigo cannot retrieve upgrade file from server'));
+        $page['errors'][] = l10n('Piwigo cannot retrieve upgrade file from server');
       }
     }
Index: /trunk/admin/include/uploadify/uploadify.php
===================================================================
--- /trunk/admin/include/uploadify/uploadify.php	(revision 25017)
+++ /trunk/admin/include/uploadify/uploadify.php	(revision 25018)
@@ -48,18 +48,5 @@
   );
 
-if (!isset($_SESSION['uploads']))
-{
-  $_SESSION['uploads'] = array();
-}
-
-if (!isset($_SESSION['uploads'][ $_POST['upload_id'] ]))
-{
-  $_SESSION['uploads'][ $_POST['upload_id'] ] = array();
-}
-
-array_push(
-  $_SESSION['uploads'][ $_POST['upload_id'] ],
-  $image_id
-  );
+$_SESSION['uploads'][ $_POST['upload_id'] ][] = $image_id;
 
 $query = '
Index: /trunk/admin/intro.php
===================================================================
--- /trunk/admin/intro.php	(revision 25017)
+++ /trunk/admin/intro.php	(revision 25018)
@@ -46,5 +46,5 @@
   if (!fetchRemote(PHPWG_URL.'/download/latest_version', $result))
   {
-    array_push($page['errors'], l10n('Unable to check for upgrade.'));
+    $page['errors'][] = l10n('Unable to check for upgrade.');
   }
   else
@@ -74,8 +74,5 @@
     if ('' == $versions['latest'])
     {
-      array_push(
-        $page['errors'],
-        l10n('Check for upgrade failed for unknown reasons.')
-        );
+      $page['errors'][] = l10n('Check for upgrade failed for unknown reasons.');
     }
     // concatenation needed to avoid automatic transformation by release
@@ -83,22 +80,13 @@
     else if ('%'.'PWGVERSION'.'%' == $versions['current'])
     {
-      array_push(
-        $page['infos'],
-        l10n('You are running on development sources, no check possible.')
-        );
+      $page['infos'][] = l10n('You are running on development sources, no check possible.');
     }
     else if (version_compare($versions['current'], $versions['latest']) < 0)
     {
-      array_push(
-        $page['infos'],
-        l10n('A new version of Piwigo is available.')
-        );
+      $page['infos'][] = l10n('A new version of Piwigo is available.');
     }
     else
     {
-      array_push(
-        $page['infos'],
-        l10n('You are running the latest version of Piwigo.')
-        );
+      $page['infos'][] = l10n('You are running the latest version of Piwigo.');
     }
   }
@@ -202,10 +190,7 @@
     'DB_ELEMENTS' => l10n_dec('%d photo', '%d photos', $nb_elements),
     'DB_CATEGORIES' =>
-      l10n_dec('%d album including', '%d albums including',
-        $nb_categories).
-      l10n_dec('%d physical', '%d physicals',
-        $nb_physical).
-      l10n_dec(' and %d virtual', ' and %d virtuals',
-        $nb_virtual),
+      l10n_dec('%d album including', '%d albums including', $nb_categories).
+      l10n_dec('%d physical', '%d physicals', $nb_physical).
+      l10n_dec(' and %d virtual', ' and %d virtuals', $nb_virtual),
     'DB_IMAGE_CATEGORY' => l10n_dec('%d association', '%d associations', $nb_image_category),
     'DB_TAGS' => l10n_dec('%d tag', '%d tags', $nb_tags),
Index: /trunk/admin/languages_installed.php
===================================================================
--- /trunk/admin/languages_installed.php	(revision 25017)
+++ /trunk/admin/languages_installed.php	(revision 25018)
@@ -88,5 +88,5 @@
   {
     $language['is_default'] = false;
-    array_push($tpl_languages, $language);
+    $tpl_languages[] = $language;
   }
 }
Index: /trunk/admin/languages_new.php
===================================================================
--- /trunk/admin/languages_new.php	(revision 25017)
+++ /trunk/admin/languages_new.php	(revision 25018)
@@ -54,5 +54,5 @@
   if (!is_webmaster())
   {
-    array_push($page['errors'], l10n('Webmaster status is required.'));
+    $page['errors'][] = l10n('Webmaster status is required.');
   }
   else
@@ -74,26 +74,21 @@
   {
     case 'ok':
-      array_push($page['infos'],
-        l10n('Language has been successfully installed')
-      );
+      $page['infos'][] = l10n('Language has been successfully installed');
       break;
 
     case 'temp_path_error':
-      array_push($page['errors'], l10n('Can\'t create temporary file.'));
+      $page['errors'][] = l10n('Can\'t create temporary file.');
       break;
 
     case 'dl_archive_error':
-      array_push($page['errors'], l10n('Can\'t download archive.'));
+      $page['errors'][] = l10n('Can\'t download archive.');
       break;
 
     case 'archive_error':
-      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
+      $page['errors'][] = l10n('Can\'t read or extract archive.');
       break;
 
     default:
-      array_push(
-        $page['errors'],
-        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']))
-      );
+      $page['errors'][] = l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']));
   }  
 }
@@ -127,5 +122,5 @@
 else
 {
-  array_push($page['errors'], l10n('Can\'t connect to server.'));
+  $page['errors'][] = l10n('Can\'t connect to server.');
 }
 
Index: /trunk/admin/menubar.php
===================================================================
--- /trunk/admin/menubar.php	(revision 25017)
+++ /trunk/admin/menubar.php	(revision 25018)
@@ -149,5 +149,5 @@
   pwg_query($query);
 
-  array_push($page['infos'], l10n('Order of menubar items has been updated successfully.'));
+  $page['infos'][] = l10n('Order of menubar items has been updated successfully.');
 }
 
Index: /trunk/admin/notification_by_mail.php
===================================================================
--- /trunk/admin/notification_by_mail.php	(revision 25017)
+++ /trunk/admin/notification_by_mail.php	(revision 25018)
@@ -81,8 +81,9 @@
 
       $must_repost = true;
-      array_push($page['errors'],
-        l10n_dec('Execution time is out, treatment must be continue [Estimated time: %d second].',
-                 'Execution time is out, treatment must be continue [Estimated time: %d seconds].',
-                  $time_refresh));
+      $page['errors'][] = l10n_dec(
+        'Execution time is out, treatment must be continue [Estimated time: %d second].',
+        'Execution time is out, treatment must be continue [Estimated time: %d seconds].',
+        $time_refresh
+        );
     }
   }
@@ -157,27 +158,18 @@
 
       // Save key
-      array_push($check_key_list, $nbm_user['check_key']);
+      $check_key_list[] = $nbm_user['check_key'];
 
       // Insert new nbm_users
-      array_push
-      (
-        $inserts,
-        array
-        (
-          'user_id' => $nbm_user['user_id'],
-          'check_key' => $nbm_user['check_key'],
-          'enabled' => 'false' // By default if false, set to true with specific functions
-        )
-      );
-
-      array_push
-      (
-        $page['infos'],
-        l10n(
-          'User %s [%s] added.',
-          stripslashes($nbm_user['username']),
-          get_email_address_as_display_text($nbm_user['mail_address'])
-        )
-      );
+      $inserts[] = array(
+        'user_id' => $nbm_user['user_id'],
+        'check_key' => $nbm_user['check_key'],
+        'enabled' => 'false' // By default if false, set to true with specific functions
+        );
+
+      $page['infos'][] = l10n(
+        'User %s [%s] added.',
+        stripslashes($nbm_user['username']),
+        get_email_address_as_display_text($nbm_user['mail_address'])
+        );
     }
 
@@ -283,5 +275,5 @@
           {
             // Stop fill list on 'list_to_send', if the quota is override
-            array_push($page['infos'], $msg_break_timeout);
+            $page['infos'][] = $msg_break_timeout;
             break;
           }
@@ -289,5 +281,5 @@
           {
             // Stop fill list on 'send', if the quota is override
-            array_push($page['errors'], $msg_break_timeout);
+            $page['errors'][] = $msg_break_timeout;
             break;
           }
@@ -300,5 +292,5 @@
             set_make_full_url();
             // Fill return list of "treated" check_key for 'send'
-            array_push($return_list, $nbm_user['check_key']);
+            $return_list[] = $nbm_user['check_key'];
 
             if ($conf['nbm_send_detailed_content'])
@@ -403,7 +395,8 @@
                 inc_mail_sent_success($nbm_user);
 
-                $data = array('user_id' => $nbm_user['user_id'],
-                              'last_send' => $dbnow);
-                array_push($datas, $data);
+                $datas[] = array(
+                  'user_id' => $nbm_user['user_id'],
+                  'last_send' => $dbnow
+                  );
               }
               else
@@ -420,5 +413,5 @@
             {
               // Fill return list of "selected" users for 'list_to_send'
-              array_push($return_list, $nbm_user);
+              $return_list[] = $nbm_user;
             }
           }
@@ -449,5 +442,5 @@
         if ($is_action_send)
         {
-          array_push($page['errors'], l10n('No user to send notifications by mail.'));
+          $page['errors'][] = l10n('No user to send notifications by mail.');
         }
       }
@@ -530,7 +523,8 @@
       }
 
-      array_push($page['infos'],
-        l10n_dec('%d parameter was updated.', '%d parameters were updated.',
-          $updated_param_count));
+      $page['infos'][] = l10n_dec(
+        '%d parameter was updated.', '%d parameters were updated.',
+        $updated_param_count
+        );
 
       // Reload conf with new values
Index: /trunk/admin/permalinks.php
===================================================================
--- /trunk/admin/permalinks.php	(revision 25017)
+++ /trunk/admin/permalinks.php	(revision 25018)
@@ -60,5 +60,5 @@
       elseif (isset($default_field) and !isset($_GET[$get_param]) )
       {
-        array_push($ret, $field);
+        $ret[] = $field;
         $disp = '<em>'.$disp.'</em>';
       }
@@ -66,5 +66,5 @@
     else
     {
-      array_push($ret, $field);
+      $ret[] = $field;
       $disp = '<em>'.$disp.'</em>';
     }
@@ -101,5 +101,7 @@
   $result = pwg_query($query);
   if (pwg_db_changes($result)==0)
-    array_push($page['errors'], l10n('Cannot delete the old permalink !'));
+  {
+    $page['errors'][] = l10n('Cannot delete the old permalink !');
+  }
 }
 
Index: /trunk/admin/photos_add_direct.php
===================================================================
--- /trunk/admin/photos_add_direct.php	(revision 25017)
+++ /trunk/admin/photos_add_direct.php	(revision 25018)
@@ -44,10 +44,7 @@
   foreach (explode(',', $_GET['batch']) as $image_id)
   {
-    array_push(
-      $inserts,
-      array(
-        'user_id' => $user['id'],
-        'element_id' => $image_id,
-        )
+    $inserts[] = array(
+      'user_id' => $user['id'],
+      'element_id' => $image_id,
       );
   }
Index: /trunk/admin/picture_modify.php
===================================================================
--- /trunk/admin/picture_modify.php	(revision 25017)
+++ /trunk/admin/picture_modify.php	(revision 25018)
@@ -105,5 +105,5 @@
 {
   sync_metadata(array( intval($_GET['image_id'])));
-  array_push($page['infos'], l10n('Metadata synchronized from file'));
+  $page['infos'][] = l10n('Metadata synchronized from file');
 }
 
@@ -121,5 +121,5 @@
     )
   {
-    array_push($page['errors'], l10n('wrong date'));
+    $page['errors'][] = l10n('wrong date');
   }
 }
@@ -204,5 +204,5 @@
   $represent_options_selected = $_POST['represent'];
   
-  array_push($page['infos'], l10n('Photo informations updated'));
+  $page['infos'][] = l10n('Photo informations updated');
 }
 
Index: /trunk/admin/plugins_installed.php
===================================================================
--- /trunk/admin/plugins_installed.php	(revision 25017)
+++ /trunk/admin/plugins_installed.php	(revision 25018)
@@ -65,5 +65,5 @@
   if (!is_webmaster())
   {
-    array_push($page['errors'], l10n('Webmaster status is required.'));
+    $page['errors'][] = l10n('Webmaster status is required.');
   }
   else
@@ -91,5 +91,5 @@
   {
     if ($plugin == '~~expire~~') continue;
-    array_push($incompatible_plugins, $plugin);
+    $incompatible_plugins[] = $plugin;
     
   }
@@ -153,5 +153,5 @@
   }
 
-  array_push($tpl_plugins, $tpl_plugin);
+  $tpl_plugins[] = $tpl_plugin;
 }
 
@@ -171,15 +171,12 @@
 if (count($missing_plugin_ids) > 0)
 {
-  foreach($missing_plugin_ids as $plugin_id)
-  {
-    array_push(
-      $tpl_plugins,
-      array(
-        'NAME' => $plugin_id,
-        'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'],
-        'DESC' => l10n('ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'),
-        'U_ACTION' => sprintf($action_url, $plugin_id),
-        'STATE' => 'missing',
-        )
+  foreach ($missing_plugin_ids as $plugin_id)
+  {
+    $tpl_plugins[] = array(
+      'NAME' => $plugin_id,
+      'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'],
+      'DESC' => l10n('ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'),
+      'U_ACTION' => sprintf($action_url, $plugin_id),
+      'STATE' => 'missing',
       );
   }
Index: /trunk/admin/plugins_new.php
===================================================================
--- /trunk/admin/plugins_new.php	(revision 25017)
+++ /trunk/admin/plugins_new.php	(revision 25018)
@@ -40,5 +40,5 @@
   if (!is_webmaster())
   {
-    array_push($page['errors'], l10n('Webmaster status is required.'));
+    $page['errors'][] = l10n('Webmaster status is required.');
   }
   else
@@ -58,25 +58,23 @@
   {
     case 'ok':
-      array_push($page['infos'],
-        l10n('Plugin has been successfully copied'),
-        l10n('You might go to plugin list to install and activate it.'));
+      $page['infos'][] = l10n('Plugin has been successfully copied');
+      $page['infos'][] = l10n('You might go to plugin list to install and activate it.');
       break;
 
     case 'temp_path_error':
-      array_push($page['errors'], l10n('Can\'t create temporary file.'));
+      $page['errors'][] = l10n('Can\'t create temporary file.');
       break;
 
     case 'dl_archive_error':
-      array_push($page['errors'], l10n('Can\'t download archive.'));
+      $page['errors'][] = l10n('Can\'t download archive.');
       break;
 
     case 'archive_error':
-      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
+      $page['errors'][] = l10n('Can\'t read or extract archive.');
       break;
 
     default:
-      array_push($page['errors'],
-        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus'])),
-        l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).'));
+      $page['errors'][] = l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']));
+      $page['errors'][] = l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).');
   }  
 }
@@ -136,5 +134,5 @@
 else
 {
-  array_push($page['errors'], l10n('Can\'t connect to server.'));
+  $page['errors'][] = l10n('Can\'t connect to server.');
 }
 
Index: /trunk/admin/rating.php
===================================================================
--- /trunk/admin/rating.php	(revision 25017)
+++ /trunk/admin/rating.php	(revision 25018)
@@ -195,5 +195,5 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  array_push($images, $row);
+  $images[] = $row;
 }
 
Index: /trunk/admin/site_manager.php
===================================================================
--- /trunk/admin/site_manager.php	(revision 25017)
+++ /trunk/admin/site_manager.php	(revision 25018)
@@ -76,6 +76,5 @@
   if ($row['count'] > 0)
   {
-    array_push($page['errors'],
-      l10n('This site already exists').' ['.$url.']');
+    $page['errors'][] = l10n('This site already exists').' ['.$url.']';
   }
   if (count($page['errors']) == 0)
@@ -83,6 +82,5 @@
     if ( ! file_exists($url) )
     {
-      array_push($page['errors'],
-        l10n('Directory does not exist').' ['.$url.']');
+      $page['errors'][] = l10n('Directory does not exist').' ['.$url.']';
     }
   }
@@ -97,6 +95,5 @@
 ;';
     pwg_query($query);
-    array_push($page['infos'],
-               $url.' '.l10n('created'));
+    $page['infos'][] = $url.' '.l10n('created');
   }
 }
@@ -122,6 +119,5 @@
     {
       delete_site($page['site']);
-      array_push($page['infos'],
-                 $galleries_url.' '.l10n('deleted'));
+      $page['infos'][] = $galleries_url.' '.l10n('deleted');
       break;
     }
Index: /trunk/admin/site_reader_local.php
===================================================================
--- /trunk/admin/site_reader_local.php	(revision 25017)
+++ /trunk/admin/site_reader_local.php	(revision 25018)
@@ -53,10 +53,7 @@
   if (!is_dir($this->site_url))
   {
-    array_push(
-      $errors,
-      array(
-        'path' => $this->site_url,
-        'type' => 'PWG-ERROR-NO-FS'
-        )
+    $errors[] = array(
+      'path' => $this->site_url,
+      'type' => 'PWG-ERROR-NO-FS'
       );
 
@@ -109,10 +106,10 @@
         }
       }
-      elseif (is_dir($path.'/'.$node)
+      else if (is_dir($path.'/'.$node)
                and $node != 'pwg_high'
                and $node != 'pwg_representative'
                and $node != 'thumbnail' )
       {
-        array_push($subdirs, $node);
+        $subdirs[] = $node;
       }
     } //end while readdir
Index: /trunk/admin/site_update.php
===================================================================
--- /trunk/admin/site_update.php	(revision 25017)
+++ /trunk/admin/site_update.php	(revision 25018)
@@ -200,5 +200,5 @@
   if (isset($_POST['cat']))
   {
-    array_push($fs_fulldirs, $basedir);
+    $fs_fulldirs[] = $basedir;
   }
   // If $_POST['subcats-included'] != 1 ("Search in sub-albums" is unchecked)
@@ -254,8 +254,6 @@
       }
 
-      array_push($inserts, $insert);
-      array_push(
-        $infos,
-        array(
+      $inserts[] = $insert;
+      $infos[] = array(
           'path' => $fulldir,
           'info' => l10n('added')
@@ -278,10 +276,7 @@
     else
     {
-      array_push(
-        $errors,
-        array(
-          'path' => $fulldir,
-          'type' => 'PWG-UPDATE-1'
-          )
+      $errors[] = array(
+        'path' => $fulldir,
+        'type' => 'PWG-UPDATE-1'
         );
     }
@@ -327,4 +322,5 @@
               $granted_grps[$row['cat_id']]=array();
             }
+            // TODO: explanaition
             array_push(
               $granted_grps,
@@ -350,4 +346,5 @@
               $granted_users[$row['cat_id']]=array();
             }
+            // TODO: explanaition
             array_push(
               $granted_users,
@@ -373,11 +370,8 @@
               foreach ($granted_grps[$parent_id] as $granted_grp)
               {
-                array_push(
-                  $insert_granted_grps,
-                  array(
-                    'group_id' => $granted_grp,
-                    'cat_id' => $ids
-                  )
-                );
+                $insert_granted_grps[] = array(
+                  'group_id' => $granted_grp,
+                  'cat_id' => $ids
+                  );
               }
             }
@@ -386,22 +380,16 @@
               foreach ($granted_users[$parent_id] as $granted_user)
               {
-                array_push(
-                  $insert_granted_users,
-                  array(
-                    'user_id' => $granted_user,
-                    'cat_id' => $ids
-                  )
-                );
+                $insert_granted_users[] = array(
+                  'user_id' => $granted_user,
+                  'cat_id' => $ids
+                  );
               }
             }
             foreach (get_admins() as $granted_user)
             {
-              array_push(
-                $insert_granted_users,
-                array(
-                  'user_id' => $granted_user,
-                  'cat_id' => $ids
-                )
-              );
+              $insert_granted_users[] = array(
+                'user_id' => $granted_user,
+                'cat_id' => $ids
+                );
             }
           }
@@ -421,11 +409,17 @@
 
   // to delete categories
-  $to_delete = array(); $to_delete_derivative_dirs = array();
+  $to_delete = array();
+  $to_delete_derivative_dirs = array();
+  
   foreach (array_diff(array_keys($db_fulldirs), $fs_fulldirs) as $fulldir)
   {
-    array_push($to_delete, $db_fulldirs[$fulldir]);
+    $to_delete[] = $db_fulldirs[$fulldir];
     unset($db_fulldirs[$fulldir]);
-    array_push($infos, array('path' => $fulldir,
-                             'info' => l10n('deleted')));
+    
+    $infos[] = array(
+      'path' => $fulldir,
+      'info' => l10n('deleted')
+      );
+      
     if (substr_compare($fulldir, '../', 0, 3)==0)
     {
@@ -434,4 +428,5 @@
     $to_delete_derivative_dirs[] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$fulldir;
   }
+  
   if (count($to_delete) > 0)
   {
@@ -506,10 +501,7 @@
     if (!preg_match($conf['sync_chars_regex'], $filename))
     {
-      array_push(
-        $errors,
-        array(
-          'path' => $path,
-          'type' => 'PWG-UPDATE-1'
-          )
+      $errors[] = array(
+        'path' => $path,
+        'type' => 'PWG-UPDATE-1'
         );
 
@@ -533,23 +525,14 @@
     }
 
-    array_push(
-      $inserts,
-      $insert
+    $inserts[] = $insert;
+
+    $insert_links[] = array(
+      'image_id'    => $insert['id'],
+      'category_id' => $insert['storage_category_id'],
       );
 
-    array_push(
-      $insert_links,
-      array(
-        'image_id'    => $insert['id'],
-        'category_id' => $insert['storage_category_id'],
-        )
-      );
-
-    array_push(
-      $infos,
-      array(
-        'path' => $insert['path'],
-        'info' => l10n('added')
-        )
+    $infos[] = array(
+      'path' => $insert['path'],
+      'info' => l10n('added')
       );
 
@@ -588,7 +571,9 @@
   foreach (array_diff($db_elements, array_keys($fs)) as $path)
   {
-    array_push($to_delete_elements, array_search($path, $db_elements));
-    array_push($infos, array('path' => $path,
-                             'info' => l10n('deleted')));
+    $to_delete_elements[] = array_search($path, $db_elements);
+    $infos[] = array(
+      'path' => $path,
+      'info' => l10n('deleted')
+      );
   }
   if (count($to_delete_elements) > 0)
@@ -659,5 +644,5 @@
 
       $data['id']=$id;
-      array_push($datas, $data);
+      $datas[] = $data;
     } // end foreach file
 
@@ -740,5 +725,5 @@
       $data['date_metadata_update'] = CURRENT_DATE;
       $data['id']=$id;
-      array_push($datas, $data);
+      $datas[] = $data;
 
       foreach (array('keywords', 'tags') as $key)
@@ -753,8 +738,5 @@
           foreach (explode(',', $data[$key]) as $tag_name)
           {
-            array_push(
-              $tags_of[$id],
-              tag_id_from_tag_name($tag_name)
-              );
+            $tags_of[$id][] = tag_id_from_tag_name($tag_name);
           }
         }
@@ -763,5 +745,8 @@
     else
     {
-      array_push($errors, array('path' => $element_infos['path'], 'type' => 'PWG-ERROR-NO-FS'));
+      $errors[] = array(
+        'path' => $element_infos['path'],
+        'type' => 'PWG-ERROR-NO-FS'
+        );
     }
   }
Index: /trunk/admin/stats.php
===================================================================
--- /trunk/admin/stats.php	(revision 25017)
+++ /trunk/admin/stats.php	(revision 25018)
@@ -98,5 +98,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($output, $row);
+    $output[] = $row;
   }
 
@@ -227,5 +227,5 @@
     {
       $row['nb_pages'] += $need_update[$key];
-      array_push($updates, $row);
+      $updates[] = $row;
       unset($need_update[$key]);
     }
@@ -237,14 +237,11 @@
   $time_tokens = explode('-', $time_key);
 
-  array_push(
-      $inserts,
-      array(
-        'year'     => $time_tokens[0],
-        'month'    => @$time_tokens[1],
-        'day'      => @$time_tokens[2],
-        'hour'     => @$time_tokens[3],
-        'nb_pages' => $nb_pages,
-        )
-      );
+  $inserts[] = array(
+    'year'     => $time_tokens[0],
+    'month'    => @$time_tokens[1],
+    'day'      => @$time_tokens[2],
+    'hour'     => @$time_tokens[3],
+    'nb_pages' => $nb_pages,
+    );
 }
 
@@ -324,8 +321,5 @@
 $url = PHPWG_ROOT_PATH.'admin.php?page=stats';
 
-array_push(
-  $title_parts,
-  '<a href="'.$url.'">'.l10n('Overall').'</a>'
-  );
+$title_parts[] = '<a href="'.$url.'">'.l10n('Overall').'</a>';
 
 $period_label = l10n('Year');
@@ -335,8 +329,5 @@
   $url.= '&amp;year='.$page['year'];
 
-  array_push(
-    $title_parts,
-    '<a href="'.$url.'">'.$page['year'].'</a>'
-    );
+  $title_parts[] = '<a href="'.$url.'">'.$page['year'].'</a>';
 
   $period_label = l10n('Month');
@@ -347,8 +338,5 @@
   $url.= '&amp;month='.$page['month'];
 
-  array_push(
-    $title_parts,
-    '<a href="'.$url.'">'.$lang['month'][$page['month']].'</a>'
-    );
+  $title_parts[] = '<a href="'.$url.'">'.$lang['month'][$page['month']].'</a>';
 
   $period_label = l10n('Day');
@@ -367,8 +355,5 @@
     );
 
-  array_push(
-    $title_parts,
-    '<a href="'.$url.'">'.$day_title.'</a>'
-    );
+  $title_parts[] = '<a href="'.$url.'">'.$day_title.'</a>';
 
   $period_label = l10n('Hour');
Index: /trunk/admin/tags.php
===================================================================
--- /trunk/admin/tags.php	(revision 25017)
+++ /trunk/admin/tags.php	(revision 25018)
@@ -70,21 +70,12 @@
       if (in_array($tag_name, $existing_names))
       {
-        array_push(
-          $page['errors'],
-          l10n(
-            'Tag "%s" already exists',
-            $tag_name
-            )
-          );
+        $page['errors'][] = l10n('Tag "%s" already exists', $tag_name);
       }
       else if (!empty($tag_name))
       {
-        array_push(
-          $updates,
-          array(
-            'id' => $tag_id,
-            'name' => addslashes($tag_name),
-            'url_name' => trigger_event('render_tag_url', $tag_name),
-            )
+        $updates[] = array(
+          'id' => $tag_id,
+          'name' => addslashes($tag_name),
+          'url_name' => trigger_event('render_tag_url', $tag_name),
           );
       }
@@ -135,11 +126,5 @@
       if (in_array($tag_name, $existing_names))
       {
-        array_push(
-          $page['errors'],
-          l10n(
-            'Tag "%s" already exists',
-            $tag_name
-            )
-          );
+        $page['errors'][] = l10n('Tag "%s" already exists', $tag_name);
       }
       else if (!empty($tag_name))
@@ -172,10 +157,7 @@
         foreach ($destination_tag_image_ids as $image_id)
         {
-          array_push(
-            $inserts,
-            array(
-              'tag_id' => $destination_tag_id,
-              'image_id' => $image_id
-              )
+          $inserts[] = array(
+            'tag_id' => $destination_tag_id,
+            'image_id' => $image_id
             );
         }
@@ -189,11 +171,9 @@
             );
         }
-        array_push(
-          $page['infos'],
-          l10n(
-            'Tag "%s" is now a duplicate of "%s"',
-            stripslashes($tag_name),
-            $current_name_of[$tag_id]
-            )
+        
+        $page['infos'][] = l10n(
+          'Tag "%s" is now a duplicate of "%s"',
+          stripslashes($tag_name),
+          $current_name_of[$tag_id]
           );
       }
@@ -218,8 +198,5 @@
   if (!isset($_POST['destination_tag']))
   {
-    array_push(
-      $page['errors'],
-      l10n('No destination tag selected')
-      );
+    $page['errors'][] = l10n('No destination tag selected');
   }
   else
@@ -275,10 +252,7 @@
       foreach ($image_ids_to_link as $image_id)
       {
-        array_push(
-          $inserts,
-          array(
-            'tag_id' => $destination_tag_id,
-            'image_id' => $image_id
-            )
+        $inserts[] = array(
+          'tag_id' => $destination_tag_id,
+          'image_id' => $image_id
           );
       }
@@ -299,11 +273,8 @@
       }
 
-      array_push(
-        $page['infos'],
-        l10n(
-          'Tags <em>%s</em> merged into tag <em>%s</em>',
-          implode(', ', $tags_deleted),
-          $name_of_tag[$destination_tag_id]
-          )
+      $page['infos'][] = l10n(
+        'Tags <em>%s</em> merged into tag <em>%s</em>',
+        implode(', ', $tags_deleted),
+        $name_of_tag[$destination_tag_id]
         );
     }
@@ -327,12 +298,9 @@
   delete_tags($_POST['tags']);
 
-  array_push(
-    $page['infos'],
-    l10n_dec(
-      'The following tag was deleted',
-      'The %d following tags were deleted',
-      count($tag_names)).' : '.
-      implode(', ', $tag_names)
-    );
+  $page['infos'][] = l10n_dec(
+    'The following tag was deleted', 'The %d following tags were deleted',
+    count($tag_names)
+    )
+  .' : '.implode(', ', $tag_names);
 }
 
@@ -379,21 +347,9 @@
       );
 
-    array_push(
-      $page['infos'],
-      l10n(
-        'Tag "%s" was added',
-        stripslashes($tag_name)
-        )
-      );
+    $page['infos'][] = l10n('Tag "%s" was added', stripslashes($tag_name));
   }
   else
   {
-    array_push(
-      $page['errors'],
-      l10n(
-        'Tag "%s" already exists',
-        stripslashes($tag_name)
-        )
-      );
+    $page['errors'][] = l10n('Tag "%s" already exists', stripslashes($tag_name));
   }
 }
@@ -421,17 +377,14 @@
 foreach ($orphan_tags as $tag)
 {
-  array_push($orphan_tag_names, trigger_event('render_tag_name', $tag['name']));
+  $orphan_tag_names[] = trigger_event('render_tag_name', $tag['name']);
 }
 
 if (count($orphan_tag_names) > 0)
 {
-  array_push(
-    $page['warnings'],
-    sprintf(
-      l10n('You have %d orphan tags: %s.').' <a href="%s">'.l10n('Delete orphan tags').'</a>',
-      count($orphan_tag_names),
-      implode(', ', $orphan_tag_names),
-      get_root_url().'admin.php?page=tags&amp;action=delete_orphans&amp;pwg_token='.get_pwg_token()
-      )
+  $page['warnings'][] = sprintf(
+    l10n('You have %d orphan tags: %s.').' <a href="%s">'.l10n('Delete orphan tags').'</a>',
+    count($orphan_tag_names),
+    implode(', ', $orphan_tag_names),
+    get_root_url().'admin.php?page=tags&amp;action=delete_orphans&amp;pwg_token='.get_pwg_token()
     );
 }
Index: /trunk/admin/themes_installed.php
===================================================================
--- /trunk/admin/themes_installed.php	(revision 25017)
+++ /trunk/admin/themes_installed.php	(revision 25018)
@@ -63,5 +63,5 @@
 foreach ($db_themes as $db_theme)
 {
-  array_push($db_theme_ids, $db_theme['id']);
+  $db_theme_ids[] = $db_theme['id'];
 }
 
@@ -144,5 +144,5 @@
   }
   
-  array_push($tpl_themes, $tpl_theme);
+  $tpl_themes[] = $tpl_theme;
 }
 
Index: /trunk/admin/themes_new.php
===================================================================
--- /trunk/admin/themes_new.php	(revision 25017)
+++ /trunk/admin/themes_new.php	(revision 25018)
@@ -51,5 +51,5 @@
   if (!is_webmaster())
   {
-    array_push($page['errors'], l10n('Webmaster status is required.'));
+    $page['errors'][] = l10n('Webmaster status is required.');
   }
   else
@@ -76,26 +76,23 @@
   {
     case 'ok':
-      array_push(
-        $page['infos'],
-        l10n('Theme has been successfully installed')
-        );
+      $page['infos'][] = l10n('Theme has been successfully installed');
       break;
 
     case 'temp_path_error':
-      array_push($page['errors'], l10n('Can\'t create temporary file.'));
+      $page['errors'][] = l10n('Can\'t create temporary file.');
       break;
 
     case 'dl_archive_error':
-      array_push($page['errors'], l10n('Can\'t download archive.'));
+      $page['errors'][] = l10n('Can\'t download archive.');
       break;
 
     case 'archive_error':
-      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
+      $page['errors'][] = l10n('Can\'t read or extract archive.');
       break;
 
     default:
-      array_push(
-        $page['errors'],
-        l10n('An error occured during extraction (%s).', htmlspecialchars($_GET['installstatus']))
+      $page['errors'][] = l10n(
+        'An error occured during extraction (%s).',
+        htmlspecialchars($_GET['installstatus'])
         );
   }  
@@ -131,5 +128,5 @@
 else
 {
-  array_push($page['errors'], l10n('Can\'t connect to server.'));
+  $page['errors'][] = l10n('Can\'t connect to server.');
 }
 
Index: /trunk/admin/updates_ext.php
===================================================================
--- /trunk/admin/updates_ext.php	(revision 25017)
+++ /trunk/admin/updates_ext.php	(revision 25018)
@@ -33,6 +33,6 @@
 if (!$autoupdate->get_server_extensions())
 {
-  array_push($page['errors'], l10n('Can\'t connect to server.'));
-  return;
+  $page['errors'][] = l10n('Can\'t connect to server.');
+  return; // TODO: remove this return and add a proper "page killer"
 }
 
Index: /trunk/admin/updates_pwg.php
===================================================================
--- /trunk/admin/updates_pwg.php	(revision 25017)
+++ /trunk/admin/updates_pwg.php	(revision 25018)
@@ -150,5 +150,5 @@
 if (!is_webmaster())
 {
-  array_push($page['errors'], l10n('Webmaster status is required.'));
+  $page['errors'][] = l10n('Webmaster status is required.');
 }
 
Index: /trunk/admin/user_list.php
===================================================================
--- /trunk/admin/user_list.php	(revision 25017)
+++ /trunk/admin/user_list.php	(revision 25018)
@@ -120,5 +120,5 @@
     $user['groups'] = array();
 
-    array_push($users, $user);
+    $users[] = $user;
   }
 
@@ -141,8 +141,5 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push(
-        $users[$user_nums[$row['user_id']]]['groups'],
-        $row['group_id']
-        );
+      $users[ $user_nums[ $row['user_id'] ] ]['groups'][] = $row['group_id'];
     }
   }
@@ -192,17 +189,17 @@
     if(empty($_POST['password']))
     {
-      array_push($page['errors'], l10n('Password is missing. Please enter the password.'));
+      $page['errors'][] = l10n('Password is missing. Please enter the password.');
     }
     else if(empty($_POST['password_conf']))
     {
-      array_push($page['errors'], l10n('Password confirmation is missing. Please confirm the chosen password.'));
+      $page['errors'][] = l10n('Password confirmation is missing. Please confirm the chosen password.');
     }
     else if(empty($_POST['email']))
     {
-      array_push($page['errors'], l10n('Email address is missing. Please specify an email address.'));
+      $page['errors'][] = l10n('Email address is missing. Please specify an email address.');
     }
     else if ($_POST['password'] != $_POST['password_conf'])
     {
-      array_push($page['errors'], l10n('The passwords do not match'));
+      $page['errors'][] = l10n('The passwords do not match');
     }
     else
@@ -213,11 +210,5 @@
       if (count($page['errors']) == 0)
       {
-        array_push(
-          $page['infos'],
-          l10n(
-            'user "%s" added',
-            $_POST['login']
-          )
-        );
+        $page['infos'][] = l10n('user "%s" added', $_POST['login']);
       }
     }
@@ -233,11 +224,5 @@
     if (count($page['errors']) == 0)
     {
-      array_push(
-        $page['infos'],
-        l10n(
-          'user "%s" added',
-          stripslashes($_POST['login'])
-          )
-        );
+      $page['infos'][] = l10n('user "%s" added', stripslashes($_POST['login']));
     }
   }
@@ -296,5 +281,5 @@
       foreach($page['filtered_users'] as $local_user)
       {
-        array_push($collection, $local_user['id']);
+        $collection[] = $local_user['id'];
       }
       break;
@@ -312,5 +297,5 @@
   if (count($collection) == 0)
   {
-    array_push($page['errors'], l10n('Select at least one user'));
+    $page['errors'][] = l10n('Select at least one user');
   }
 }
@@ -323,18 +308,18 @@
   if (in_array($conf['guest_id'], $collection))
   {
-    array_push($page['errors'], l10n('Guest cannot be deleted'));
+    $page['errors'][] = l10n('Guest cannot be deleted');
   }
   if (($conf['guest_id'] != $conf['default_user_id']) and
       in_array($conf['default_user_id'], $collection))
   {
-    array_push($page['errors'], l10n('Default user cannot be deleted'));
+    $page['errors'][] = l10n('Default user cannot be deleted');
   }
   if (in_array($conf['webmaster_id'], $collection))
   {
-    array_push($page['errors'], l10n('Webmaster cannot be deleted'));
+    $page['errors'][] = l10n('Webmaster cannot be deleted');
   }
   if (in_array($user['id'], $collection))
   {
-    array_push($page['errors'], l10n('You cannot delete your account'));
+    $page['errors'][] = l10n('You cannot delete your account');
   }
 
@@ -347,11 +332,10 @@
         delete_user($user_id);
       }
-      array_push(
-        $page['infos'],
-        l10n_dec(
-          '%d user deleted', '%d users deleted',
-          count($collection)
-          )
+      
+      $page['infos'][] = l10n_dec(
+        '%d user deleted', '%d users deleted',
+        count($collection)
         );
+      
       foreach ($page['filtered_users'] as $filter_key => $filter_user)
       {
@@ -364,5 +348,5 @@
     else
     {
-      array_push($page['errors'], l10n('You need to confirm deletion'));
+      $page['errors'][] = l10n('You need to confirm deletion');
     }
   }
@@ -392,7 +376,8 @@
       foreach ($associable as $item)
       {
-        array_push($datas,
-                   array('group_id'=>$_POST['associate'],
-                         'user_id'=>$item));
+        $datas[] = array(
+          'group_id' => $_POST['associate'],
+          'user_id' => $item
+          );
       }
 
@@ -427,6 +412,6 @@
   if ($conf['activate_comments'])
   {
-    array_push($formfields, 'show_nb_comments');
-    array_push($true_false_fields, 'show_nb_comments');
+    $formfields[] = 'show_nb_comments';
+    $true_false_fields[] = 'show_nb_comments';
   }
 
@@ -445,5 +430,5 @@
     if ($_POST[$test] != 'leave')
     {
-      array_push($dbfields['update'], $formfield);
+      $dbfields['update'][] = $formfield;
     }
   }
@@ -481,5 +466,5 @@
           if (!in_array('level', $dbfields['update']))
           {
-            array_push($dbfields['update'], 'level');
+            $dbfields['update'][] = 'level';
           }
         }
@@ -508,5 +493,5 @@
       }
 
-      array_push($datas, $data);
+      $datas[] = $data;
     }
 
Index: /trunk/admin/user_perm.php
===================================================================
--- /trunk/admin/user_perm.php	(revision 25017)
+++ /trunk/admin/user_perm.php	(revision 25018)
@@ -120,6 +120,6 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($cats, $row);
-    array_push($group_authorized, $row['cat_id']);
+    $cats[] = $row;
+    $group_authorized[] = $row['cat_id'];
   }
   usort($cats, 'global_rank_compare');
@@ -153,5 +153,5 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  array_push($authorized_ids, $row['id']);
+  $authorized_ids[] = $row['id'];
 }
 
Index: /trunk/comments.php
===================================================================
--- /trunk/comments.php	(revision 25017)
+++ /trunk/comments.php	(revision 25018)
@@ -447,6 +447,6 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  array_push($comments, $row);
-  array_push($element_ids, $row['image_id']);
+  $comments[] = $row;
+  $element_ids[] = $row['image_id'];
 }
 
Index: /trunk/identification.php
===================================================================
--- /trunk/identification.php	(revision 25017)
+++ /trunk/identification.php	(revision 25018)
@@ -40,5 +40,5 @@
   if ( is_a_guest() )
   {
-    array_push($page['errors'], l10n('You are not authorized to access the requested page'));
+    $page['errors'][] = l10n('You are not authorized to access the requested page');
   }
 }
@@ -48,8 +48,5 @@
   if (!isset($_COOKIE[session_name()]))
   {
-    array_push(
-      $page['errors'],
-      l10n('Cookies are blocked or not supported by your browser. You must enable cookies to connect.')
-      );
+    $page['errors'][] = l10n('Cookies are blocked or not supported by your browser. You must enable cookies to connect.');
   }
   else
@@ -69,5 +66,5 @@
     else
     {
-      array_push($page['errors'], l10n('Invalid password!') );
+      $page['errors'][] = l10n('Invalid password!');
     }
   }
Index: /trunk/include/calendar_monthly.class.php
===================================================================
--- /trunk/include/calendar_monthly.class.php	(revision 25017)
+++ /trunk/include/calendar_monthly.class.php	(revision 25018)
@@ -389,5 +389,5 @@
       }
 
-      array_push( $wday_labels, array_shift($wday_labels) );
+      $wday_labels[] = array_shift($wday_labels);
     }
 
Index: /trunk/include/calendar_weekly.class.php
===================================================================
--- /trunk/include/calendar_weekly.class.php	(revision 25017)
+++ /trunk/include/calendar_weekly.class.php	(revision 25018)
@@ -69,6 +69,5 @@
       $this->calendar_levels[CWEEK]['sql'] = pwg_db_get_week($this->date_field, 5).'+1';
       $this->calendar_levels[CDAY]['sql'] = pwg_db_get_weekday($this->date_field);
-      array_push( $this->calendar_levels[CDAY]['labels'],
-                  array_shift( $this->calendar_levels[CDAY]['labels'] ) );
+      $this->calendar_levels[CDAY]['labels'][] = array_shift($this->calendar_levels[CDAY]['labels']);
     }
   }
Index: /trunk/include/category_cats.inc.php
===================================================================
--- /trunk/include/category_cats.inc.php	(revision 25017)
+++ /trunk/include/category_cats.inc.php	(revision 25018)
@@ -208,5 +208,5 @@
           if (isset($image_id) and !in_array($image_id, $image_ids))
           {
-            array_push($new_image_ids, $image_id);
+            $new_image_ids[] = $image_id;
           }
 
Index: /trunk/include/dblayer/functions_mysql.inc.php
===================================================================
--- /trunk/include/dblayer/functions_mysql.inc.php	(revision 25017)
+++ /trunk/include/dblayer/functions_mysql.inc.php	(revision 25018)
@@ -329,5 +329,5 @@
           $column.= " collate '".$row['Collation']."'";
         }
-        array_push($columns, $column);
+        $columns[] = $column;
       }
     }
@@ -565,5 +565,5 @@
   while ($row = pwg_db_fetch_row($result))
   {
-    array_push($all_tables, $row[0]);
+    $all_tables[] = $row[0];
   }
 
@@ -583,5 +583,5 @@
       if ($row['Key'] == 'PRI')
       {
-        array_push($all_primary_key, $row['Field']);
+        $all_primary_key[] = $row['Field'];
       }
     }
@@ -599,15 +599,9 @@
   if ($mysql_rc)
   {
-    array_push(
-          $page['infos'],
-          l10n('All optimizations have been successfully completed.')
-          );
+    $page['infos'][] = l10n('All optimizations have been successfully completed.');
   }
   else
   {
-    array_push(
-          $page['errors'],
-          l10n('Optimizations have been completed with some errors.')
-          );
+    $page['errors'][] = l10n('Optimizations have been completed with some errors.');
   }
 }
Index: /trunk/include/dblayer/functions_mysqli.inc.php
===================================================================
--- /trunk/include/dblayer/functions_mysqli.inc.php	(revision 25017)
+++ /trunk/include/dblayer/functions_mysqli.inc.php	(revision 25018)
@@ -366,5 +366,5 @@
           $column.= " collate '".$row['Collation']."'";
         }
-        array_push($columns, $column);
+        $columns[] = $column;
       }
     }
@@ -602,5 +602,5 @@
   while ($row = pwg_db_fetch_row($result))
   {
-    array_push($all_tables, $row[0]);
+    $all_tables[] = $row[0];
   }
 
@@ -620,5 +620,5 @@
       if ($row['Key'] == 'PRI')
       {
-        array_push($all_primary_key, $row['Field']);
+        $all_primary_key[] = $row['Field'];
       }
     }
@@ -636,15 +636,9 @@
   if ($mysqli_rc)
   {
-    array_push(
-          $page['infos'],
-          l10n('All optimizations have been successfully completed.')
-          );
+    $page['infos'][] = l10n('All optimizations have been successfully completed.');
   }
   else
   {
-    array_push(
-          $page['errors'],
-          l10n('Optimizations have been completed with some errors.')
-          );
+    $page['errors'][] = l10n('Optimizations have been completed with some errors.');
   }
 }
Index: /trunk/include/filter.inc.php
===================================================================
--- /trunk/include/filter.inc.php	(revision 25017)
+++ /trunk/include/filter.inc.php	(revision 25018)
@@ -124,5 +124,8 @@
   if (get_filter_page_value('add_notes'))
   {
-    $header_notes[] = l10n_dec('Photos posted within the last %d day.', 'Photos posted within the last %d days.', $filter['recent_period']);
+    $header_notes[] = l10n_dec(
+      'Photos posted within the last %d day.', 'Photos posted within the last %d days.',
+      $filter['recent_period']
+      );
   }
   include_once(PHPWG_ROOT_PATH.'include/functions_filter.inc.php');
Index: /trunk/include/functions.inc.php
===================================================================
--- /trunk/include/functions.inc.php	(revision 25017)
+++ /trunk/include/functions.inc.php	(revision 25018)
@@ -879,6 +879,8 @@
   foreach ($caddiables as $caddiable)
   {
-    array_push($datas, array('element_id' => $caddiable,
-                             'user_id' => $user['id']));
+    $datas[] = array(
+      'element_id' => $caddiable,
+      'user_id' => $user['id'],
+      );
   }
 
Index: /trunk/include/functions_calendar.inc.php
===================================================================
--- /trunk/include/functions_calendar.inc.php	(revision 25017)
+++ /trunk/include/functions_calendar.inc.php	(revision 25018)
@@ -213,5 +213,5 @@
             if ( isset($page['chronology_date'][0]) )
             {
-              array_push($chronology_date, $page['chronology_date'][0]);
+              $chronology_date[] = $page['chronology_date'][0];
             }
           }
Index: /trunk/include/functions_comment.inc.php
===================================================================
--- /trunk/include/functions_comment.inc.php	(revision 25017)
+++ /trunk/include/functions_comment.inc.php	(revision 25018)
@@ -94,5 +94,5 @@
       if ($conf['comments_author_mandatory'])
       {
-        array_push($infos, l10n('Username is mandatory') );
+        $infos[] = l10n('Username is mandatory');
         $comment_action='reject';
       }
@@ -111,5 +111,5 @@
       if ( $row['user_exists'] == 1 )
       {
-        array_push($infos, l10n('This login is already used by another user') );
+        $infos[] = l10n('This login is already used by another user');
         $comment_action='reject';
       }
@@ -142,5 +142,5 @@
     if (!url_check_format($comm['website_url']))
     {
-      array_push($infos, l10n('Your website URL is invalid'));
+      $infos[] = l10n('Your website URL is invalid');
       $comment_action='reject';
     }
@@ -156,5 +156,5 @@
     else if ($conf['comments_email_mandatory'])
     {
-      array_push($infos, l10n('Email address is missing. Please specify an email address.') );
+      $infos[] = l10n('Email address is missing. Please specify an email address.');
       $comment_action='reject';
     }
@@ -162,5 +162,5 @@
   else if (!email_check_format($comm['email']))
   {
-    array_push($infos, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+    $infos[] = l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
     $comment_action='reject';
   }
@@ -193,5 +193,5 @@
     if ( $counter > 0 )
     {
-      array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
+      $infos[] = l10n('Anti-flood system : please wait for a moment before trying to post another comment');
       $comment_action='reject';
     }
Index: /trunk/include/functions_mail.inc.php
===================================================================
--- /trunk/include/functions_mail.inc.php	(revision 25017)
+++ /trunk/include/functions_mail.inc.php	(revision 25018)
@@ -294,5 +294,5 @@
       if (!empty($admin['mail_address']))
       {
-        array_push($admins, format_email($admin['username'], $admin['mail_address']));
+        $admins[] = format_email($admin['username'], $admin['mail_address']);
       }
     }
@@ -420,5 +420,5 @@
           if (!empty($row['mail_address']))
           {
-            array_push($Bcc, format_email(stripslashes($row['username']), $row['mail_address']));
+            $Bcc[] = format_email(stripslashes($row['username']), $row['mail_address']);
           }
         }
Index: /trunk/include/functions_notification.inc.php
===================================================================
--- /trunk/include/functions_notification.inc.php	(revision 25017)
+++ /trunk/include/functions_notification.inc.php	(revision 25018)
@@ -207,5 +207,5 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push($infos, $row);
+      $infos[] = $row;
     }
 
@@ -370,5 +370,5 @@
       $line = '<a href="'.$url.'">'.$line.'</a>';
     }
-    array_push($news, $line);
+    $news[] = $line;
   }
 }
@@ -451,5 +451,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($dates, $row);
+    $dates[] = $row;
   }
 
@@ -470,5 +470,5 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        array_push($dates[$i]['elements'], $row);
+        $dates[$i]['elements'][] = $row;
       }
     }
@@ -490,5 +490,5 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        array_push($dates[$i]['categories'], $row);
+        $dates[$i]['categories'][] = $row;
       }
     }
@@ -547,6 +547,5 @@
   $description .=
         '<li>'
-        .l10n_dec('%d album updated', '%d albums updated',
-                  $date_detail['nb_cats'])
+        .l10n_dec('%d album updated', '%d albums updated', $date_detail['nb_cats'])
         .'</li>';
 
@@ -558,6 +557,5 @@
           .get_cat_display_name_cache($cat['uppercats'])
           .' ('.
-          l10n_dec('%d new photo',
-                   '%d new photos', $cat['img_count']).')'
+          l10n_dec('%d new photo', '%d new photos', $cat['img_count']).')'
           .'</li>';
   }
Index: /trunk/include/functions_plugins.inc.php
===================================================================
--- /trunk/include/functions_plugins.inc.php	(revision 25017)
+++ /trunk/include/functions_plugins.inc.php	(revision 25018)
@@ -221,5 +221,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($plugins, $row);
+    $plugins[] = $row;
   }
   return $plugins;
Index: /trunk/include/functions_search.inc.php
===================================================================
--- /trunk/include/functions_search.inc.php	(revision 25017)
+++ /trunk/include/functions_search.inc.php	(revision 25018)
@@ -69,5 +69,5 @@
       foreach ($search['fields'][$textfield]['words'] as $word)
       {
-        array_push($local_clauses, $textfield." LIKE '%".$word."%'");
+        $local_clauses[] = $textfield." LIKE '%".$word."%'";
       }
 
@@ -75,10 +75,7 @@
       $local_clauses = prepend_append_array_items($local_clauses, '(', ')');
 
-      array_push(
-        $clauses,
-        implode(
-          ' '.$search['fields'][$textfield]['mode'].' ',
-          $local_clauses
-          )
+      $clauses[] = implode(
+        ' '.$search['fields'][$textfield]['mode'].' ',
+        $local_clauses
         );
     }
@@ -101,13 +98,10 @@
       foreach ($fields as $field)
       {
-        array_push($field_clauses, $field." LIKE '%".$word."%'");
+        $field_clauses[] = $field." LIKE '%".$word."%'";
       }
       // adds brackets around where clauses
-      array_push(
-        $word_clauses,
-        implode(
-          "\n          OR ",
-          $field_clauses
-          )
+      $word_clauses[] = implode(
+        "\n          OR ",
+        $field_clauses
         );
     }
@@ -118,14 +112,9 @@
       );
 
-    array_push(
-      $clauses,
-      "\n         ".
+    $clauses[] = "\n         ".
       implode(
-        "\n         ".
-              $search['fields']['allwords']['mode'].
-        "\n         ",
+        "\n         ". $search['fields']['allwords']['mode']. "\n         ",
         $word_clauses
-        )
-      );
+        );
   }
 
@@ -134,8 +123,5 @@
     if (isset($search['fields'][$datefield]))
     {
-      array_push(
-        $clauses,
-        $datefield." = '".$search['fields'][$datefield]['date']."'"
-        );
+      $clauses[] = $datefield." = '".$search['fields'][$datefield]['date']."'"
     }
 
@@ -146,13 +132,8 @@
       if (isset($search['fields'][$key]))
       {
-        array_push(
-          $clauses,
-
-          $datefield.
+        $clauses[] = $datefield.
           ($suffix == 'after'             ? ' >' : ' <').
           ($search['fields'][$key]['inc'] ? '='  : '').
-          " '".$search['fields'][$key]['date']."'"
-
-          );
+          " '".$search['fields'][$key]['date']."'";
       }
     }
@@ -172,5 +153,5 @@
 
     $local_clause = 'category_id IN ('.implode(',', $cat_ids).')';
-    array_push($clauses, $local_clause);
+    $clauses[] = $local_clause;
   }
 
Index: /trunk/include/functions_tag.inc.php
===================================================================
--- /trunk/include/functions_tag.inc.php	(revision 25017)
+++ /trunk/include/functions_tag.inc.php	(revision 25018)
@@ -333,5 +333,5 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    array_push($tags, $row);
+    $tags[] = $row;
   }
   return $tags;
Index: /trunk/include/functions_url.inc.php
===================================================================
--- /trunk/include/functions_url.inc.php	(revision 25017)
+++ /trunk/include/functions_url.inc.php	(revision 25018)
@@ -467,12 +467,11 @@
           if (empty($maybe_permalinks))
           {
-            array_push($maybe_permalinks, $tokens[$current_token]);
+            $maybe_permalinks[] = $tokens[$current_token];
           }
           else
           {
-            array_push($maybe_permalinks,
+            $maybe_permalinks[] = 
                 $maybe_permalinks[count($maybe_permalinks)-1]
-                . '/' . $tokens[$current_token]
-              );
+                . '/' . $tokens[$current_token];
           }
           $current_token++;
@@ -528,9 +527,9 @@
       if ( $conf['tag_url_style'] != 'tag' and preg_match('/^(\d+)(?:-(.*)|)$/', $tokens[$i], $matches) )
       {
-        array_push($requested_tag_ids, $matches[1]);
+        $requested_tag_ids[] = $matches[1];
       }
       else
       {
-        array_push($requested_tag_url_names, $tokens[$i]);
+        $requested_tag_url_names[] = $tokens[$i];
       }
       $i++;
@@ -598,5 +597,5 @@
     {
       // Add dummy element list
-      array_push($page['list'], -1);
+      $page['list'][] = -1;
     }
     // With pictures list
@@ -609,5 +608,5 @@
       foreach (explode(',', $tokens[$next_token]) as $image_id)
       {
-        array_push($page['list'], $image_id);
+        $page['list'][] = $image_id;
       }
     }
Index: /trunk/include/picture_comment.inc.php
===================================================================
--- /trunk/include/picture_comment.inc.php	(revision 25017)
+++ /trunk/include/picture_comment.inc.php	(revision 25018)
@@ -61,11 +61,11 @@
   {
     case 'moderate':
-      array_push($page['infos'], l10n('An administrator must authorize your comment before it is visible.') );
+      $page['infos'][] = l10n('An administrator must authorize your comment before it is visible.');
     case 'validate':
-      array_push($page['infos'], l10n('Your comment has been registered'));
+      $page['infos'][] = l10n('Your comment has been registered');
       break;
     case 'reject':
       set_status_header(403);
-      array_push($page['errors'], l10n('Your comment has NOT been registered because it did not pass the validation rules') );
+      $page['errors'][] = l10n('Your comment has NOT been registered because it did not pass the validation rules');
       break;
     default:
Index: /trunk/include/section_init.inc.php
===================================================================
--- /trunk/include/section_init.inc.php	(revision 25017)
+++ /trunk/include/section_init.inc.php	(revision 25018)
@@ -340,5 +340,5 @@
     foreach ($page['tags'] as $tag)
     {
-      array_push($page['tag_ids'], $tag['id']);
+      $page['tag_ids'][] = $tag['id'];
     }
 
Index: /trunk/include/ws_functions.inc.php
===================================================================
--- /trunk/include/ws_functions.inc.php	(revision 25017)
+++ /trunk/include/ws_functions.inc.php	(revision 25018)
@@ -402,5 +402,5 @@
   foreach ( array_from_query($query, 'id') as $id )
   {
-    array_push($datas, array('element_id'=>$id, 'user_id'=>$user['id']) );
+    $datas[] = array('element_id'=>$id, 'user_id'=>$user['id']);
   }
   if (count($datas))
@@ -794,5 +794,5 @@
             if (isset($image_id) and !in_array($image_id, $image_ids))
             {
-              array_push($new_image_ids, $image_id);
+              $new_image_ids[] = $image_id;
             }
 
@@ -833,11 +833,8 @@
     foreach ($user_representative_updates_for as $cat_id => $image_id)
     {
-      array_push(
-        $updates,
-        array(
-          'user_id' => $user['id'],
-          'cat_id' => $cat_id,
-          'user_representative_picture_id' => $image_id,
-          )
+      $updates[] = array(
+        'user_id' => $user['id'],
+        'cat_id' => $cat_id,
+        'user_representative_picture_id' => $image_id,
         );
     }
@@ -995,11 +992,11 @@
   {
     case 'reject':
-      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
+      $infos[] = l10n('Your comment has NOT been registered because it did not pass the validation rules');
       return new PwgError(403, implode("; ", $infos) );
     case 'validate':
     case 'moderate':
       $ret = array(
-          'id' => $comm['id'],
-          'validation' => $comment_action=='validate',
+        'id' => $comm['id'],
+        'validation' => $comment_action=='validate',
         );
       return array( 'comment' =>  new PwgNamedStruct($ret) );
@@ -1072,5 +1069,5 @@
       );
     $row['id']=(int)$row['id'];
-    array_push($related_categories, $row);
+    $related_categories[] = $row;
   }
   usort($related_categories, 'global_rank_compare');
@@ -1545,5 +1542,5 @@
       {
         ws_logfile($file);
-        array_push($chunks, $upload_dir.'/'.$file);
+        $chunks[] = $upload_dir.'/'.$file;
       }
     }
@@ -1602,5 +1599,5 @@
       if (preg_match($pattern, $file))
       {
-        array_push($chunks, $upload_dir.'/'.$file);
+        $chunks[] = $upload_dir.'/'.$file;
       }
     }
@@ -1959,6 +1956,5 @@
       foreach ($params['tags'] as $tag_name)
       {
-        $tag_id = tag_id_from_tag_name($tag_name);
-        array_push($tag_ids, $tag_id);
+        $tag_ids[] = tag_id_from_tag_name($tag_name);
       }
     }
@@ -1968,6 +1964,5 @@
       foreach ($tag_names as $tag_name)
       {
-        $tag_id = tag_id_from_tag_name(preg_replace('#\\\\*,#', ',', $tag_name));
-        array_push($tag_ids, $tag_id);
+        $tag_ids[] = tag_id_from_tag_name(preg_replace('#\\\\*,#', ',', $tag_name));
       }
     }
@@ -2663,5 +2658,5 @@
     if ($image_id > 0)
     {
-      array_push($image_ids, $image_id);
+      $image_ids[] = $image_id;
     }
   }
@@ -2695,5 +2690,5 @@
     }
 
-    array_push($cat_ids, $cat_id);
+    $cat_ids[] = $cat_id;
 
     if (!isset($rank))
@@ -2804,11 +2799,8 @@
   foreach ($new_cat_ids as $cat_id)
   {
-    array_push(
-      $inserts,
-      array(
-        'image_id' => $image_id,
-        'category_id' => $cat_id,
-        'rank' => $rank_on_category[$cat_id],
-        )
+    $inserts[] = array(
+      'image_id' => $image_id,
+      'category_id' => $cat_id,
+      'rank' => $rank_on_category[$cat_id],
       );
   }
@@ -2996,5 +2988,5 @@
     if ($category_id > 0)
     {
-      array_push($category_ids, $category_id);
+      $category_ids[] = $category_id;
     }
   }
@@ -3054,5 +3046,5 @@
     if ($category_id > 0)
     {
-      array_push($category_ids, $category_id);
+      $category_ids[] = $category_id;
     }
   }
@@ -3421,5 +3413,5 @@
   if (!in_array($params['id'], $conf['updates_ignored'][$params['type']]))
   {
-    array_push($conf['updates_ignored'][$params['type']], $params['id']);
+    $conf['updates_ignored'][ $params['type'] ][] = $params['id'];
   }
   conf_update_param('updates_ignored', pwg_db_real_escape_string(serialize($conf['updates_ignored'])));
Index: /trunk/include/ws_protocols/rest_encoder.php
===================================================================
--- /trunk/include/ws_protocols/rest_encoder.php	(revision 25017)
+++ /trunk/include/ws_protocols/rest_encoder.php	(revision 25018)
@@ -67,5 +67,5 @@
     $this->_output( '<'.$name );
     $this->_lastTagOpen = true;
-    array_push( $this->_elementStack, $name);
+    $this->_elementStack[] = $name;
   }
 
Index: /trunk/install.php
===================================================================
--- /trunk/install.php	(revision 25017)
+++ /trunk/install.php	(revision 25018)
@@ -253,23 +253,33 @@
 include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
 
-if ( isset( $_POST['install'] ))
+if (isset($_POST['install']))
 {
   install_db_connect($infos, $errors);
   pwg_db_check_charset();
 
-  $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
-  if ( empty($webmaster))
-    array_push( $errors, l10n('enter a login for webmaster') );
-  else if ( preg_match( '/[\'"]/', $webmaster ) )
-    array_push( $errors, l10n('webmaster login can\'t contain characters \' or "') );
-  if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) )
-    array_push( $errors, l10n('please enter your password again') );
-  if ( empty($admin_mail))
-    array_push( $errors, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
+  $webmaster = trim(preg_replace('/\s{2,}/', ' ', $admin_name));
+  if (empty($webmaster))
+  {
+    $errors[] = l10n('enter a login for webmaster');
+  }
+  else if (preg_match( '/[\'"]/', $webmaster))
+  {
+    $errors[] = l10n('webmaster login can\'t contain characters \' or "');
+  }
+  if ($admin_pass1 != $admin_pass2 || empty($admin_pass1))
+  {
+    $errors[] = l10n('please enter your password again');
+  }
+  if (empty($admin_mail))
+  {
+    $errors[] = l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
+  }
   else
   {
     $error_mail_address = validate_mail_address(null, $admin_mail);
     if (!empty($error_mail_address))
-      array_push( $errors, $error_mail_address );
+    {
+      $errors[] = $error_mail_address;
+    }
   }
 
@@ -389,11 +399,8 @@
     foreach (get_available_upgrade_ids() as $upgrade_id)
     {
-      array_push(
-        $datas,
-        array(
-          'id'          => $upgrade_id,
-          'applied'     => CURRENT_DATE,
-          'description' => 'upgrade included in installation',
-          )
+      $datas[] = array(
+        'id'          => $upgrade_id,
+        'applied'     => CURRENT_DATE,
+        'description' => 'upgrade included in installation',
         );
     }
@@ -450,12 +457,9 @@
 else
 {
-  array_push(
-    $infos,
-    l10n('Congratulations, Piwigo installation is completed')
-    );
+  $infos[] = l10n('Congratulations, Piwigo installation is completed');
 
   if (isset($error_copy))
   {
-    array_push($errors, $error_copy);
+    $errors[] = $error_copy;
   }
   else
Index: /trunk/nbm.php
===================================================================
--- /trunk/nbm.php	(revision 25017)
+++ /trunk/nbm.php	(revision 25018)
@@ -46,6 +46,5 @@
   subscribe_notification_by_mail(false, array($_GET['subscribe']));
 }
-else
-if (isset($_GET['unsubscribe'])
+else if (isset($_GET['unsubscribe'])
     and preg_match('/^[A-Za-z0-9]{16}$/', $_GET['unsubscribe']))
 {
@@ -54,5 +53,5 @@
 else
 {
-  array_push($page['errors'], l10n('Unknown identifier'));
+  $page['errors'][] = l10n('Unknown identifier');
 }
 
Index: /trunk/password.php
===================================================================
--- /trunk/password.php	(revision 25017)
+++ /trunk/password.php	(revision 25018)
@@ -54,5 +54,5 @@
   if (empty($_POST['username_or_email']))
   {
-    array_push($page['errors'], l10n('Invalid username or email'));
+    $page['errors'][] = l10n('Invalid username or email');
     return false;
   }
@@ -67,5 +67,5 @@
   if (!is_numeric($user_id))
   {
-    array_push($page['errors'], l10n('Invalid username or email'));
+    $page['errors'][] = l10n('Invalid username or email');
     return false;
   }
@@ -77,5 +77,5 @@
   if (is_a_guest($status) or is_generic($status))
   {
-    array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+    $page['errors'][] = l10n('Password reset is not allowed for this user');
     return false;
   }
@@ -83,10 +83,7 @@
   if (empty($userdata['email']))
   {
-    array_push(
-      $page['errors'],
-      l10n(
-        'User "%s" has no email address, password reset is not possible',
-        $userdata['username']
-        )
+    $page['errors'][] = l10n(
+      'User "%s" has no email address, password reset is not possible',
+      $userdata['username']
       );
     return false;
@@ -131,10 +128,10 @@
   if (pwg_mail($userdata['email'], $email_params))
   {
-    array_push($page['infos'], l10n('Check your email for the confirmation link'));
+    $page['infos'][] = l10n('Check your email for the confirmation link');
     return true;
   }
   else
   {
-    array_push($page['errors'], l10n('Error sending email'));
+    $page['errors'][] = l10n('Error sending email');
     return false;
   }
@@ -153,5 +150,5 @@
   if (!preg_match('/^[a-z0-9]{20}$/i', $key))
   {
-    array_push($page['errors'], l10n('Invalid key'));
+    $page['errors'][] = l10n('Invalid key');
     return false;
   }
@@ -168,5 +165,5 @@
   if (pwg_db_num_rows($result) == 0)
   {
-    array_push($page['errors'], l10n('Invalid key'));
+    $page['errors'][] = l10n('Invalid key');
     return false;
   }
@@ -176,5 +173,5 @@
   if (is_a_guest($userdata['status']) or is_generic($userdata['status']))
   {
-    array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+    $page['errors'][] = l10n('Password reset is not allowed for this user');
     return false;
   }
@@ -195,5 +192,5 @@
   if ($_POST['use_new_pwd'] != $_POST['passwordConf'])
   {
-    array_push($page['errors'], l10n('The passwords do not match'));
+    $page['errors'][] = l10n('The passwords do not match');
     return false;
   }
@@ -204,5 +201,5 @@
     if (!is_numeric($user_id))
     {
-      array_push($page['errors'], l10n('Invalid key'));
+      $page['errors'][] = l10n('Invalid key');
       return false;
     }
@@ -213,5 +210,5 @@
     if (is_a_guest() or is_generic())
     {
-      array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+      $page['errors'][] = l10n('Password reset is not allowed for this user');
       return false;
     }
@@ -226,13 +223,13 @@
     );
 
-  array_push($page['infos'], l10n('Your password has been reset'));
+  $page['infos'][] = l10n('Your password has been reset');
 
   if (isset($_GET['key']))
   {
-    array_push($page['infos'], '<a href="'.get_root_url().'identification.php">'.l10n('Login').'</a>');
+    $page['infos'][] = '<a href="'.get_root_url().'identification.php">'.l10n('Login').'</a>';
   }
   else
   {
-    array_push($page['infos'], '<a href="'.get_gallery_home_url().'">'.l10n('Return to home page').'</a>');
+    $page['infos'][] = '<a href="'.get_gallery_home_url().'">'.l10n('Return to home page').'</a>';
   }
 
Index: /trunk/picture.php
===================================================================
--- /trunk/picture.php	(revision 25017)
+++ /trunk/picture.php	(revision 25018)
@@ -103,6 +103,6 @@
         if ('best_rated'==$page['section'])
         {
-          $page['rank_of'][$page['image_id']] = count($page['items']);
-          array_push($page['items'], $page['image_id'] );
+          $page['rank_of'][ $page['image_id'] ] = count($page['items']);
+          $page['items'][] = $page['image_id'];
         }
         else
@@ -469,11 +469,11 @@
 if (isset($page['previous_item']))
 {
-  array_push($ids, $page['previous_item']);
-  array_push($ids, $page['first_item']);
+  $ids[] = $page['previous_item'];
+  $ids[] = $page['first_item'];
 }
 if (isset($page['next_item']))
 {
-  array_push($ids, $page['next_item']);
-  array_push($ids, $page['last_item']);
+  $ids[] = $page['next_item'];
+  $ids[] = $page['last_item'];
 }
 
Index: /trunk/plugins/LocalFilesEditor/admin.php
===================================================================
--- /trunk/plugins/LocalFilesEditor/admin.php	(revision 25017)
+++ /trunk/plugins/LocalFilesEditor/admin.php	(revision 25018)
@@ -57,7 +57,6 @@
 {
   $content_file = file_get_contents(get_bak_file($edited_file));
-  array_push($page['infos'],
-    l10n('locfiledit_bak_loaded1'),
-    l10n('locfiledit_bak_loaded2'));
+  $page['infos'][] = l10n('locfiledit_bak_loaded1'),
+  $page['infos'][] = l10n('locfiledit_bak_loaded2');
 }
 
@@ -71,5 +70,5 @@
   if (!is_webmaster())
   {
-    array_push($page['errors'], l10n('locfiledit_webmaster_only'));
+    $page['errors'][] = l10n('locfiledit_webmaster_only');
   }
   else
@@ -82,5 +81,5 @@
     if ($content_file === false)
     {
-      array_push($page['errors'], l10n('locfiledit_syntax_error'));
+      $page['errors'][] = l10n('locfiledit_syntax_error');
     }
     else
@@ -93,5 +92,5 @@
       {
         @copy($edited_file, get_bak_file($edited_file));
-        array_push($page['infos'], l10n('locfiledit_saved_bak', substr(get_bak_file($edited_file), 2)));
+        $page['infos'][] = l10n('locfiledit_saved_bak', substr(get_bak_file($edited_file), 2));
       }
       
@@ -105,5 +104,5 @@
       else
       {
-        array_push($page['errors'], l10n('locfiledit_cant_save'));
+        $page['errors'][] = l10n('locfiledit_cant_save');
       }
     }
Index: /trunk/plugins/LocalFilesEditor/include/css.inc.php
===================================================================
--- /trunk/plugins/LocalFilesEditor/include/css.inc.php	(revision 25017)
+++ /trunk/plugins/LocalFilesEditor/include/css.inc.php	(revision 25018)
@@ -65,5 +65,5 @@
 foreach ($db_themes as $db_theme)
 {
-  array_push($db_theme_ids, $db_theme['id']);
+  $db_theme_ids[] = $db_theme['id'];
 }
 
@@ -86,10 +86,10 @@
     else
     {
-      array_push($active_themes, $fs_theme);
+      $active_themes[] = $fs_theme;
     }
   }
   else
   {
-    array_push($inactive_themes, $fs_theme);
+    $inactive_themes[] = $fs_theme;
   }
 }
Index: /trunk/plugins/LocalFilesEditor/include/tpl.inc.php
===================================================================
--- /trunk/plugins/LocalFilesEditor/include/tpl.inc.php	(revision 25017)
+++ /trunk/plugins/LocalFilesEditor/include/tpl.inc.php	(revision 25018)
@@ -40,5 +40,5 @@
   if (empty($filename))
   {
-    array_push($page['errors'], l10n('locfiledit_empty_filename'));
+    $page['errors'][] = l10n('locfiledit_empty_filename');
   }
   if (get_extension($filename) != 'tpl')
@@ -48,13 +48,13 @@
   if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename))
   {
-    array_push($page['errors'], l10n('locfiledit_filename_error'));
+    $page['errors'][] = l10n('locfiledit_filename_error');
   }
   if (is_numeric($_POST['tpl_model']) and $_POST['tpl_model'] != '0')
   {
-    array_push($page['errors'], l10n('locfiledit_model_error'));
+    $page['errors'][] = l10n('locfiledit_model_error');
   }
   if (file_exists($_POST['tpl_parent'] . '/' . $filename))
   {
-    array_push($page['errors'], l10n('locfiledit_file_already_exists'));
+    $page['errors'][] = l10n('locfiledit_file_already_exists');
   }
   if (!empty($page['errors']))
Index: /trunk/plugins/LocalFilesEditor/main.inc.php
===================================================================
--- /trunk/plugins/LocalFilesEditor/main.inc.php	(revision 25017)
+++ /trunk/plugins/LocalFilesEditor/main.inc.php	(revision 25018)
@@ -36,10 +36,7 @@
 function localfiles_admin_menu($menu)
 {
-  array_push(
-    $menu,
-    array(
-      'NAME' => 'LocalFiles Editor',
-      'URL' => get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__))
-      )
+  $menu[] = array(
+    'NAME' => 'LocalFiles Editor',
+    'URL' => get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__))
     );
   
Index: /trunk/profile.php
===================================================================
--- /trunk/profile.php	(revision 25017)
+++ /trunk/profile.php	(revision 25018)
@@ -202,5 +202,5 @@
       if (!empty($_POST['use_new_pwd']))
       {
-        array_push($fields, $conf['user_fields']['password']);
+        $fields[] = $conf['user_fields']['password'];
         // password is hashed with function $conf['password_hash']
         $data{$conf['user_fields']['password']} = $conf['password_hash']($_POST['use_new_pwd']);
@@ -212,10 +212,10 @@
         if ($_POST['username'] != $userdata['username'] and get_userid($_POST['username']))
         {
-          array_push($page['errors'], l10n('this login is already used'));
+          $page['errors'][] = l10n('this login is already used');
           unset($_POST['redirect']);
         }
         else
         {
-          array_push($fields, $conf['user_fields']['username']);
+          $fields[] = $conf['user_fields']['username'];
           $data{$conf['user_fields']['username']} = $_POST['username'];
           
@@ -263,5 +263,5 @@
       if ($conf['activate_comments'])
       {
-        array_push($fields, 'show_nb_comments');
+        $fields[] = 'show_nb_comments';
       }
 
Index: /trunk/register.php
===================================================================
--- /trunk/register.php	(revision 25017)
+++ /trunk/register.php	(revision 25018)
@@ -45,10 +45,10 @@
   {
 		set_status_header(403);
-    array_push($page['errors'], 'Invalid/expired form key');
+    $page['errors'][] = l10n('Invalid/expired form key');
   }
 
   if ($_POST['password'] != $_POST['password_conf'])
   {
-    array_push($page['errors'], l10n('please enter your password again'));
+    $page['errors'][] = l10n('please enter your password again');
   }
 
Index: /trunk/search.php
===================================================================
--- /trunk/search.php	(revision 25017)
+++ /trunk/search.php	(revision 25018)
@@ -150,5 +150,5 @@
   else
   {
-    array_push($page['errors'], l10n('Empty query. No criteria has been entered.'));
+    $page['errors'][] = l10n('Empty query. No criteria has been entered.');
   }
 }
Index: /trunk/search_rules.php
===================================================================
--- /trunk/search_rules.php	(revision 25017)
+++ /trunk/search_rules.php	(revision 25018)
@@ -139,5 +139,5 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push($categories, $row);
+      $categories[] = $row;
     }
   }
Index: /trunk/tags.php
===================================================================
--- /trunk/tags.php	(revision 25017)
+++ /trunk/tags.php	(revision 25018)
@@ -132,15 +132,8 @@
     }
 
-    array_push(
-      $letter['tags'],
-      array_merge(
-        $tag,
-        array(
-          'URL' => make_index_url(
-            array(
-              'tags' => array($tag),
-              )
-            ),
-          )
+    $letter['tags'][] = array_merge(
+      $tag,
+      array(
+        'URL' => make_index_url(array('tags' => array($tag))),
         )
       );
Index: /trunk/upgrade.php
===================================================================
--- /trunk/upgrade.php	(revision 25017)
+++ /trunk/upgrade.php	(revision 25018)
@@ -74,5 +74,5 @@
     if (preg_match('/^'.PREFIX_TABLE.'/', $row[0]))
     {
-      array_push($tables, $row[0]);
+      $tables[] = $row[0];
     }
   }
@@ -101,5 +101,5 @@
     while ($row = pwg_db_fetch_row($result))
     {
-      array_push($columns_of[$table], $row[0]);
+      $columns_of[$table][] = $row[0];
     }
   }
@@ -390,13 +390,10 @@
       if (!@file_put_contents($config_file, $config_file_contents))
       {
-        array_push(
-          $page['infos'],
-          sprintf(
-            l10n('In <i>%s</i>, before <b>?></b>, insert:'),
-            PWG_LOCAL_DIR.'config/database.inc.php'
-            )
-          .'<p><textarea rows="4" cols="40">'
-          .implode("\r\n" , $mysql_changes).'</textarea></p>'
-          );
+        $page['infos'][] = l10n(
+          'In <i>%s</i>, before <b>?></b>, insert:',
+          PWG_LOCAL_DIR.'config/database.inc.php'
+          )
+        .'<p><textarea rows="4" cols="40">'
+        .implode("\r\n" , $mysql_changes).'</textarea></p>';
       }
     }
@@ -431,7 +428,5 @@
       );
 
-    array_push($page['infos'],
-      l10n('Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.')
-      );
+    $page['infos'][] = l10n('Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.');
 
     // Save $page['infos'] in order to restore after maintenance actions
