diff -r 36dd990c0c25 -r ecb96b051d08 plugins/gallery/browser.php --- a/plugins/gallery/browser.php Thu Nov 29 22:47:20 2007 -0500 +++ b/plugins/gallery/browser.php Wed Dec 05 16:53:26 2007 -0500 @@ -118,26 +118,10 @@ // Determine number of pictures per page $template->load_theme(); - global $theme; - $fn = ENANO_ROOT . '/themes/' . $template->theme . '/theme.cfg'; - require( $fn ); - if ( isset($theme['snapr_gallery_rows']) ) - { - $rows_in_browser = intval($theme['snapr_gallery_rows']); - if ( empty($rows_in_browser) ) - { - $rows_in_browser = 5; - } - } - else - { - $rows_in_browser = 5; - } - $where = 'WHERE folder_parent IS NULL ' . "\n ORDER BY is_folder DESC, $sort_column $sort_order, img_title ASC"; $parms = $paths->getAllParams(); - $sql = "SELECT img_id, img_title, is_folder FROM ".table_prefix."gallery $where;"; + $sql = "SELECT img_id, img_title, is_folder, 'NULL' AS folder_id FROM ".table_prefix."gallery $where;"; // Breadcrumb browser $breadcrumbs = array(); @@ -330,6 +314,7 @@ { if ( !isset($first_row['folder_id']) ) { + //die('FALLING
' . print_r($first_row, true) . '
'); $first_row['folder_id'] =& $first_row['img_id']; } if ( !isset($first_row['folder_id']) )