From 05ab300c39f10271bc94b9fece8f275e3ac75174 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 12 Jan 2011 20:41:00 +0000
Subject: [PATCH] - 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      | 1 +
 include/template.class.php | 1 -
 picture.php                | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/maintenance.php b/admin/maintenance.php
index 6e39eb0e2..6edf7e9e2 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -112,6 +112,7 @@ DELETE
   case 'compiled-templates' :
   {
     $template->delete_compiled_templates();
+    FileCombiner::clear_combined_files();
     break;
   }
   default :
diff --git a/include/template.class.php b/include/template.class.php
index f1b53039c..9e8a6231f 100644
--- a/include/template.class.php
+++ b/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)
diff --git a/picture.php b/picture.php
index ace364f31..7f8df0da5 100644
--- a/picture.php
+++ b/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',