Changeset 1027 in ExiteCMS for branches/PLi-Fusion/administration/index.php

Timestamp:

10/27/07 11:28:20 (5 years ago)

Author:

root

Message:

Merged trunk revision 1018:1026 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• . (modified) (1 prop)
• administration/index.php (modified) (1 diff)

branches/PLi-Fusion

@@ -2 +2 @@
 config.backup.php
 config.php
+_revision_.svn

@@ -2 +2 @@
 config.backup.php
 config.php
+_revision_.svn

branches/PLi-Fusion/administration/index.php

@@ -65 +65 @@
     while ($data = dbarray($result)) {
         if (checkrights($data['admin_rights']) && $data['admin_link'] != "reserved") {
-            // check the location of the admin image, and add the correct path to it
+            // check the location and the existence of the admin image, and pass the full path to the template
             $path = explode("/", $data['admin_link']);
-            if (isset($path[2])) {
+            if (isset($path[2]) && file_exists(PATH_MODULES.$path[2]."/images/".$data['admin_image'])) {
                 $data['admin_image'] = MODULES.$path[2]."/images/".$data['admin_image'];
             } else {
-                $data['admin_image'] = ADMIN."images/".$data['admin_image'];
+                if (file_exists(PATH_ADMIN."images/".$data['admin_image'])) {
+                    $data['admin_image'] = ADMIN."images/".$data['admin_image'];
+                } else {
+                    $data['admin_image'] = ADMIN."images/module_panel.gif";
+                }
             }
             // store the record

@@ -2 +2 @@
 config.backup.php
 config.php
+_revision_.svn