Changeset 13074 for trunk/include/page_header.php

Timestamp:

Feb 9, 2012, 10:11:34 PM (12 years ago)

Author:

rvelices

Message:

• remove square/thumb from choices on picture
• fix content margin on password register
• purge derivative cache by type of derivative
• session saved infos/messages are not given to the page on html redirections
• shorter/faster code in functions_xxx

File:

• trunk/include/page_header.php (modified) (3 diffs)

trunk/include/page_header.php

@@ -67 +67 @@
 
 // No referencing is required
-if ( !$conf['meta_ref'] ) 
+if ( !$conf['meta_ref'] )
 {
   $page['meta_robots']['noindex'] = 1;
@@ -82 +82 @@
 }
 if ( !isset($page['meta_robots']['noindex']) )
-{ 
-  $template->assign('meta_ref',1); 
+{
+  $template->assign('meta_ref',1);
 }
 
@@ -98 +98 @@
       ));
 }
+else
+{// messages only if no redirection
+  foreach (array('errors','infos') as $mode)
+  {
+    if (isset($_SESSION['page_'.$mode]))
+    {
+      $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
+      unset($_SESSION['page_'.$mode]);
+    }
 
-
-// messages
-foreach (array('errors','infos') as $mode)
-{
-  if (isset($_SESSION['page_'.$mode]))
-  {
-    $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
-    unset($_SESSION['page_'.$mode]);
-  }
-  
-  if (count($page[$mode]) != 0)
-  {
-    $template->assign($mode, $page[$mode]);
+    if (count($page[$mode]) != 0)
+    {
+      $template->assign($mode, $page[$mode]);
+    }
   }
 }
-
 trigger_action('loc_end_page_header');