From cb8be5f82182998bfb5a69ef10a5354e1ae2accd Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 26 Oct 2006 05:31:14 +0000
Subject: - Patch #89285 by profix: code simplifications.

---
 modules/system/system.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/system/system.module')

diff --git a/modules/system/system.module b/modules/system/system.module
index 060fe40b2..e94a6fb7f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -498,7 +498,7 @@ function system_theme_select_form($description = '', $default_value = '', $weigh
         $info->screenshot = dirname($info->filename) . '/screenshot.png';
         $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot');
 
-        $form['themes'][$info->key]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
+        $form['themes'][$info->key]['screenshot'] = array('#value' => $screenshot);
         $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'bluemarine') ? t('<br /> <em>(site default theme)</em>') : ''));
         $options[$info->key] = '';
       }
@@ -1122,14 +1122,14 @@ function system_themes() {
     $info->screenshot = dirname($info->filename) . '/screenshot.png';
     $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot');
 
-    $form[$info->name]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
+    $form[$info->name]['screenshot'] = array('#value' => $screenshot);
     $form[$info->name]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename));
     $options[$info->name] = '';
     if ($info->status) {
       $status[] = $info->name;
     }
     if ($info->status && (function_exists($info->prefix . '_settings') || function_exists($info->prefix . '_features'))) {
-      $form[$info->name]['operations'] = array('#type' => 'markup', '#value' => l(t('configure'), 'admin/build/themes/settings/' . $info->name) );
+      $form[$info->name]['operations'] = array('#value' => l(t('configure'), 'admin/build/themes/settings/' . $info->name) );
     }
     else {
       // Dummy element for drupal_render. Cleaner than adding a check in the theme function.
-- 
cgit v1.2.3