Changeset 18710

Timestamp:

Oct 21, 2012, 3:58:35 PM (12 years ago)

Author:

mistic100

Message:

remove warnings in some cases when there are no banners

Location:

extensions/header_manager

Files:

• admin/config.php (modified) (2 diffs)
• include/header_manager.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/header_manager/admin/config.php

@@ -22 +22 @@
     'width' => $conf['header_manager']['width'],
     'height' => $conf['header_manager']['height'],
-    'image' => $_POST['image'],
+    'image' => @$_POST['image'],
     'display' => $_POST['display'],
     'banner_on_picture' => isset($_POST['banner_on_picture']),
@@ -60 +60 @@
 
 // config template
-if (get_banner($conf['header_manager']['image']) === false)
+if ( empty($conf['header_manager']['image']) or get_banner($conf['header_manager']['image']) === false )
 {
   $conf['header_manager']['image'] = 'random';

extensions/header_manager/include/header_manager.inc.php

@@ -48 +48 @@
   if (!isset($banner))
   {
-    if ($conf['header_manager']['image'] == 'random')
+    if ( empty($conf['header_manager']['image']) or $conf['header_manager']['image'] == 'random')
     {
       $banners = list_banners();

extensions/header_manager/main.inc.php

@@ -44 +44 @@
   
   if (
+    HEADER_MANAGER_VERSION == 'auto' or
     $pwg_loaded_plugins['header_manager']['version'] == 'auto' or
     version_compare($pwg_loaded_plugins['header_manager']['version'], HEADER_MANAGER_VERSION, '<')
@@ -51 +52 @@
     header_manager_install();
     
-    if ($pwg_loaded_plugins['header_manager']['version'] != 'auto')
+    if ( $pwg_loaded_plugins['header_manager']['version'] != 'auto' and HEADER_MANAGER_VERSION != 'auto' )
     {
       $query = '