Changeset 688

Timestamp:

Jan 13, 2005, 11:18:49 AM (19 years ago)

Author:

plg

Message:

• 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

Location:

trunk

Files:

• about.php (modified) (1 diff)
• admin.php (modified) (1 diff)
• admin/search.php (modified) (1 diff)
• category.php (modified) (1 diff)
• comments.php (modified) (1 diff)
• identification.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• include/page_header.php (modified) (1 diff)
• include/page_tail.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• profile.php (modified) (1 diff)
• register.php (modified) (1 diff)
• search.php (modified) (1 diff)
• upload.php (modified) (1 diff)

trunk/about.php

@@ -46 +46 @@
         );
 
-$template->pparse('about');
+$template->parse('about');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/admin.php

@@ -245 +245 @@
   $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');
 // +-----------------------------------------------------------------------+

trunk/admin/search.php

@@ -104 +104 @@
 }
 
-$template->pparse('search');
+$template->parse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/category.php

@@ -333 +333 @@
 mysql_close();
 
-$template->pparse('category');
+$template->parse('category');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/comments.php

@@ -233 +233 @@
 {
   $template->assign_block_vars('title',array());
-  $template->pparse('comments');
+  $template->parse('comments');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }

trunk/identification.php

@@ -99 +99 @@
 $template->assign_block_vars('free_access',array());
 //----------------------------------------------------------- html code display
-$template->pparse('identification');
+$template->parse('identification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/include/functions.inc.php

@@ -544 +544 @@
 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
@@ -551 +551 @@
   $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' );

trunk/include/page_header.php

@@ -55 +55 @@
 }
 
-$template->pparse('header');
+$template->parse('header');
 ?>

trunk/include/page_tail.php

@@ -60 +60 @@
 //
 
-$template->pparse('tail');
+$template->parse('tail');
+
+$template->p();
 ?>

trunk/picture.php

@@ -1030 +1030 @@
 mysql_close();
 
-$template->pparse('picture');
+$template->parse('picture');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/profile.php

@@ -349 +349 @@
 {
   $template->assign_block_vars('modify.profile',array());
-  $template->pparse('profile_body');
+  $template->parse('profile_body');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }

trunk/register.php

@@ -84 +84 @@
 }
 
-$template->pparse('register');
+$template->parse('register');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/search.php

@@ -270 +270 @@
 pwg_log( 'search', $title );
 mysql_close();
-$template->pparse('search');
+$template->parse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>

trunk/upload.php

@@ -375 +375 @@
 }
 //----------------------------------------------------------- html code display
-$template->pparse('upload');
+$template->parse('upload');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>