Changeset 1018 in ExiteCMS

Timestamp:

10/24/07 22:35:49 (4 years ago)

Author:

hverton

Message:

Merged trunk revision 1013:1017 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• administration/index.php (modified) (1 diff)
• click.php (deleted)
• includes/templates/admin.index.tpl (modified) (1 diff)

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
+            $path = explode("/", $data['admin_link']);
+            if (isset($path[2])) {
+                $data['admin_image'] = MODULES.$path[2]."/images/".$data['admin_image'];
+            } else {
+                $data['admin_image'] = ADMIN."images/".$data['admin_image'];
+            }
+            // store the record
             $modules[] = $data;
         }

branches/PLi-Fusion/includes/templates/admin.index.tpl

@@ -58 +58 @@
                         {if $admin_images|default:false}
                             <span class='small'>
-                                <a href='{$modules[link].admin_link}{$aidlink}'><img src='{$smarty.const.ADMIN}images/{$modules[link].admin_image}' alt='{$modules[link].admin_title|escape:"html"}' style='border:0px;' /></a>
+                                <a href='{$modules[link].admin_link}{$aidlink}'><img src='{$modules[link].admin_image}' alt='{$modules[link].admin_title|escape:"html"}' style='border:0px;' /></a>
                                 <br />
                                 <a href='{$modules[link].admin_link}{$aidlink}'>{$modules[link].admin_title|escape:"html"}</a>