- picture uses the same variables as the index page to compute thumbnails url

- combined files are deleted only from maintenance functions and not also from plugin activation/deactivation

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

admin/maintenance.php

@@ -112,6 +112,7 @@ DELETE
   case 'compiled-templates' :
   {
     $template->delete_compiled_templates();
+    FileCombiner::clear_combined_files();
     break;
   }
   default :

include/template.class.php

@@ -186,7 +186,6 @@ class Template {
       $this->smarty->clear_compiled_tpl();
       $this->smarty->compile_id = $save_compile_id;
       file_put_contents($this->smarty->compile_dir.'/index.htm', 'Not allowed!');
-      FileCombiner::clear_combined_files();
   }
 
   function get_themeconf($val)

picture.php

@@ -215,8 +215,8 @@ if ($page['current_rank'] != $page['last_rank'])
 $url_up = duplicate_index_url(
   array(
     'start' =>
-      floor($page['current_rank'] / $user['nb_image_page'])
-      * $user['nb_image_page']
+      floor($page['current_rank'] / $page['nb_image_page'])
+      * $page['nb_image_page']
     ),
   array(
     'start',