- use template->parse instead of pparse. (exceptions for install.php and

  upgrade.php)

- bug fixed : queries time and count were not displayed on a redirection


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

14 files changed, 18 insertions, 15 deletions

diff --git a/about.php b/about.php
index b434cd450..41b68b220 100644
--- a/about.php
+++ b/about.php
@@ -45,6 +45,6 @@ $template->assign_vars(array(
 	)
 	);
 
-$template->pparse('about');
+$template->parse('about');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/admin.php b/admin.php
index eec37c1bb..fa08bae24 100644
--- a/admin.php
+++ b/admin.php
@@ -244,7 +244,7 @@ else
 {
   $template->assign_vars(array ('ADMIN_CONTENT'=> '<div style="text-align:center">'.$lang['default_message'].'</div>') );
 }
-$template->pparse('admin');
+$template->parse('admin');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 // +-----------------------------------------------------------------------+
 // |                     order permission refreshment                      |
diff --git a/admin/search.php b/admin/search.php
index e072abf91..e6eab6258 100644
--- a/admin/search.php
+++ b/admin/search.php
@@ -103,6 +103,6 @@ if ( !empty($username_list))
     ));
 }
 
-$template->pparse('search');
+$template->parse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
\ No newline at end of file
diff --git a/category.php b/category.php
index 89547a020..f186b43b2 100644
--- a/category.php
+++ b/category.php
@@ -332,6 +332,6 @@ if ( isset ( $page['cat'] ) )
 pwg_log( 'category', $page['title'] );
 mysql_close();
 
-$template->pparse('category');
+$template->parse('category');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/comments.php b/comments.php
index 0a2fcd755..144149e05 100644
--- a/comments.php
+++ b/comments.php
@@ -232,7 +232,7 @@ if (defined('IN_ADMIN'))
 else
 {
   $template->assign_block_vars('title',array());
-  $template->pparse('comments');
+  $template->parse('comments');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }
 ?>
diff --git a/identification.php b/identification.php
index 00950d8d7..5b7a776ef 100644
--- a/identification.php
+++ b/identification.php
@@ -98,6 +98,6 @@ if ( sizeof( $errors ) != 0 )
 //-------------------------------------------------------------- visit as guest
 $template->assign_block_vars('free_access',array());
 //----------------------------------------------------------- html code display
-$template->pparse('identification');
+$template->parse('identification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 485d490b5..9b4678f65 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -543,17 +543,18 @@ function pwg_debug( $string )
  */
 function redirect( $url )
 {
-  global $user, $template, $lang_info, $conf, $lang, $t2;
+  global $user, $template, $lang_info, $conf, $lang, $t2, $page;
 
   // $refresh, $url_link and $title are required for creating an automated
   // refresh page in header.tpl
   $refresh = 0;
   $url_link = $url;
   $title = 'redirection';
+
   include( PHPWG_ROOT_PATH.'include/page_header.php' );
   
   $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
-  $template->pparse('redirect');
+  $template->parse('redirect');
   
   include( PHPWG_ROOT_PATH.'include/page_tail.php' );
 
diff --git a/include/page_header.php b/include/page_header.php
index f33c77ae1..eab8d39ab 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -54,5 +54,5 @@ if ( isset( $refresh ) and is_int($refresh) and isset( $url_link ) )
   $template->assign_block_vars('refresh', array());
 }
 
-$template->pparse('header');
+$template->parse('header');
 ?>
diff --git a/include/page_tail.php b/include/page_tail.php
index 156a9b99a..c2908e71c 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -59,5 +59,7 @@ if ($conf['show_gt'])
 // Generate the page
 //
 
-$template->pparse('tail');
+$template->parse('tail');
+
+$template->p();
 ?>
diff --git a/picture.php b/picture.php
index 5bea62881..facdfd055 100644
--- a/picture.php
+++ b/picture.php
@@ -1029,6 +1029,6 @@ if ($page['show_comments'])
 pwg_log( 'picture', $title_img, $picture['current']['file'] );
 mysql_close();
 
-$template->pparse('picture');
+$template->parse('picture');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/profile.php b/profile.php
index 0ca071094..2f4f3311e 100644
--- a/profile.php
+++ b/profile.php
@@ -348,7 +348,7 @@ if (defined('IN_ADMIN') and IN_ADMIN)
 else
 {
   $template->assign_block_vars('modify.profile',array());
-  $template->pparse('profile_body');
+  $template->parse('profile_body');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }
 ?>
diff --git a/register.php b/register.php
index 94136f1bd..28d8b18c6 100644
--- a/register.php
+++ b/register.php
@@ -83,6 +83,6 @@ if ( sizeof( $errors ) != 0 )
   }
 }
 
-$template->pparse('register');
+$template->parse('register');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/search.php b/search.php
index 9f83f2dba..4bf65c5be 100644
--- a/search.php
+++ b/search.php
@@ -269,6 +269,6 @@ if (sizeof($errors) != 0)
 //------------------------------------------------------------ log informations
 pwg_log( 'search', $title );
 mysql_close();
-$template->pparse('search');
+$template->parse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/upload.php b/upload.php
index 6ab900ef3..82bcffd2b 100644
--- a/upload.php
+++ b/upload.php
@@ -374,6 +374,6 @@ else
   $template->assign_block_vars('upload_successful',array());
 }
 //----------------------------------------------------------- html code display
-$template->pparse('upload');
+$template->parse('upload');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>