- 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

3 files changed, 7 insertions, 4 deletions

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();
 ?>