[geeklog-cvs] Geeklog-1.x/system lib-admin.php,1.115,1.116

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv16217

Modified Files:
	lib-admin.php 
Log Message:
search-field broken

Index: lib-admin.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** lib-admin.php	29 Aug 2007 09:34:53 -0000	1.115
--- lib-admin.php	29 Aug 2007 09:57:52 -0000	1.116
***************
*** 271,275 ****
      $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
      $admin_templates->set_file (array (
!         'searchmenu' => 'searchmenu.thtml',
          'list' => 'list.thtml',
          'header' => 'header.thtml',
--- 271,275 ----
      $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
      $admin_templates->set_file (array (
!         'search' => 'searchmenu.thtml',
          'list' => 'list.thtml',
          'header' => 'header.thtml',
***************
*** 314,320 ****
              . '" title="' . $LANG_ACCESS['listthem'] . '">'
      );
! 
!     // the user can disable the search. if used, create it.
!     if ($text_arr['has_search']) {
          $admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
          $admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
--- 314,322 ----
              . '" title="' . $LANG_ACCESS['listthem'] . '">'
      );
!     $has_extras = '';
!     if (isset($text_arr['has_extras'])) { # does this one use extras? (search, google paging)
!         $has_extras = $text_arr['has_extras'];
!     }
!     if ($has_extras) { // show search
          $admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
          $admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
***************
*** 322,326 ****
          $admin_templates->set_var('last_query', COM_applyFilter($query));
          $admin_templates->set_var('filter', $filter);
!         $admin_templates->parse('search_menu', 'search_menu', true);
      }
  
--- 324,328 ----
          $admin_templates->set_var('last_query', COM_applyFilter($query));
          $admin_templates->set_var('filter', $filter);
!         $admin_templates->parse('search_menu', 'search', true);
      }
  
***************
*** 422,429 ****
      }
  
-     $has_extras = '';
-     if (isset($text_arr['has_extras'])) { # does this one use extras? (google paging)
-         $has_extras = $text_arr['has_extras'];
-     }
      if ($has_extras) {
          $limit = 50; # default query limit if not other chosen.
--- 424,427 ----