4 files changed, 6 insertions, 11 deletions
diff --git a/include/filter.inc.php b/include/filter.inc.php
index 3a1279f94..fd3bf0cda 100644
--- a/include/filter.inc.php
+++ b/include/filter.inc.php
@@ -33,7 +33,7 @@ $filter = array();
 // $filter['visible_images']: List of visible images
 
 
-$filter['enabled'] = 
+$filter['enabled'] =
   (in_array(basename($_SERVER['SCRIPT_FILENAME']), $conf['filter_pages'])) and
   (
     (isset($_GET['filter']) and ($_GET['filter'] == 'start')) or
@@ -98,7 +98,7 @@ WHERE ';
     $filter['visible_images'] = pwg_get_session_var('filter_visible_images', '');
   }
 
-  $header_notes[] = l10n_dec($lang['note_filter_day'], $lang['note_filter_days'], $user['recent_period']);
+  $header_notes[] = l10n_dec('note_filter_day', 'note_filter_days', $user['recent_period']);
 }
 else
 {
diff --git a/include/functions_tag.inc.php b/include/functions_tag.inc.php
index c01bb2fc7..42704d238 100644
--- a/include/functions_tag.inc.php
+++ b/include/functions_tag.inc.php
@@ -84,10 +84,8 @@ SELECT DISTINCT image_id
 ;';
 
   $result = pwg_query($tags_query);
-
   $tags = array();
-
-  while ($row = mysql_fetch_array($result))
+  while ($row = mysql_fetch_assoc($result))
   {
     array_push($tags, $row);
   }
@@ -109,10 +107,8 @@ SELECT id AS tag_id,
   FROM '.TAGS_TABLE.'
 ;';
   $result = pwg_query($query);
-
   $tags = array();
-
-  while ($row = mysql_fetch_array($result))
+  while ($row = mysql_fetch_assoc($result))
   {
     array_push($tags, $row);
   }
@@ -269,7 +265,7 @@ SELECT tag_id, name, url_name, count(*) counter
 
   $result = pwg_query($query);
   $tags = array();
-  while($row = mysql_fetch_array($result))
+  while($row = mysql_fetch_assoc($result))
   {
     array_push($tags, $row);
   }
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index e50f3e2e8..53792083d 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -419,7 +419,7 @@ function set_make_full_url()
       $page['save_root_path']['path'] = $page['root_path'];
     }
     $page['save_root_path']['count'] = 1;
-    $page['root_path'] = 'http://'.$_SERVER['HTTP_HOST'].cookie_path();
+    $page['root_path'] = get_host_url().cookie_path();
   }
   else
   {
diff --git a/include/page_header.php b/include/page_header.php
index db7fa3b9a..2a82d5e4b 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -64,7 +64,6 @@ if (isset($header_infos))
 // Header notes
 if (count($header_notes) > 0)
 {
-  $template->assign_block_vars('header_notes', array());
   foreach ($header_notes as $header_note)
   {
     $template->assign_block_vars('header_notes.header_note',