Changeset 1308 for trunk/admin

Timestamp:

May 15, 2006, 10:53:08 PM (19 years ago)

Author:

plg

Message:

merge -r1306:1307 from branch 1.6 into trunk

File:

• trunk/admin/element_set_global.php (modified) (5 diffs)

trunk/admin/element_set_global.php

@@ -206 +206 @@
     'L_SUBMIT'=>$lang['submit'],
 
-    'U_COLS'=>$base_url.get_query_string_diff(array('cols')),
     'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
 
@@ -340 +339 @@
 // +-----------------------------------------------------------------------+
 
-$page['cols'] = !empty($_GET['cols']) ? intval($_GET['cols']) : 5;
-
 // how many items to display on this page
 if (!empty($_GET['display']))
@@ -383 +380 @@
   {
     $template->assign_block_vars('thumbnails', array());
-    // first line
-    $template->assign_block_vars('thumbnails.line', array());
-    // current row displayed
-    $row_number = 0;
   }
 
@@ -394 +387 @@
 
     $template->assign_block_vars(
-      'thumbnails.line.thumbnail',
+      'thumbnails.thumbnail',
       array(
         'ID' => $row['id'],
@@ -402 +395 @@
         )
       );
-
-    // create a new line ?
-    if (++$row_number == $page['cols'])
-    {
-    $template->assign_block_vars('thumbnails.line', array());
-    $row_number = 0;
-    }
   }
 }