- remove compatibility with old template ...

git-svn-id: http://piwigo.org/svn/trunk@2290 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 2 insertions, 32 deletions

diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index e0e410c1e..50233bfb6 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -278,36 +278,6 @@ function display_select_categories($categories,
 {
   global $template;
 
-  // TODO - remove from here after old template removed
-  foreach ($categories as $category)
-  {
-    $selected = '';
-    if (in_array($category['id'], $selecteds))
-    {
-      $selected = ' selected="selected"';
-    }
-
-    if ($fullname)
-    {
-      $option = get_cat_display_name_cache($category['uppercats'],
-                                           null,
-                                           false);
-    }
-    else
-    {
-      $option = str_repeat(' ',
-                           (3 * substr_count($category['global_rank'], '.')));
-      $option.= '- '.$category['name'];
-    }
-
-    $template->_old->assign_block_vars(
-      $blockname,
-      array('SELECTED'=>$selected,
-            'VALUE'=>$category['id'],
-            'OPTION'=>$option
-        ));
-  }
-  // TODO - remove until here after old template removed
   $tpl_cats = array();
   foreach ($categories as $category)
   {
@@ -326,8 +296,8 @@ function display_select_categories($categories,
     $tpl_cats[ $category['id'] ] = $option;
   }
 
-  $template->smarty->assign( $blockname, $tpl_cats);
-  $template->smarty->assign( $blockname.'_selected', $selecteds);
+  $template->assign( $blockname, $tpl_cats);
+  $template->assign( $blockname.'_selected', $selecteds);
 }
 
 function display_select_cat_wrapper($query, $selecteds, $blockname,