- improvement: use new function get_language_filepath in about.php

  (complement of bug 168 correction)


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

2 files changed, 12 insertions, 15 deletions

diff --git a/about.php b/about.php
index 7e6bd9c88..6f58f6557 100644
--- a/about.php
+++ b/about.php
@@ -36,27 +36,19 @@ $title= $lang['about_page_title'];
 $page['body_id'] = 'theAboutPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
-$template->set_filenames(array('about'=>'about.tpl'));
+$template->set_filenames(
+  array(
+    'about'=>'about.tpl',
+    'about_content' => get_language_filepath('about.html')
+    )
+  );
+  
 $template->assign_vars(
   array(
     'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php')
     )
   );
 
-// language files
-$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
-$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
-
-if (file_exists($user_langdir.'/about.html'))
-{
-  $html_file = $user_langdir.'/about.html';
-}
-else
-{
-  $html_file = $conf_langdir.'/about.html';
-}
-
-$template->set_filenames(array('about_content' => $html_file));
 $template->assign_var_from_handle('ABOUT_MESSAGE', 'about_content');
   
 $template->parse('about');
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b53b56630..c8021b96f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-17 Pierrick LE GALL
 
+	* improvement: use new function get_language_filepath in about.php
+	(complement of bug 168 correction)
+	
+2005-10-17 Pierrick LE GALL
+
 	* bug 154 fixed: "Calendar category, too precise dates". Bug came
 	from the bigger precision of creation_date and available_date in
 	images tables. Need to retrieve only the year-month-day