#602522 follow-up by effulgentsia: Fix a couple of straggler missed operation link conversions.

5 files changed, 22 insertions, 6 deletions

diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc
index a860be8c5..413b9bbf9 100644
--- a/modules/image/image.admin.inc
+++ b/modules/image/image.admin.inc
@@ -394,7 +394,9 @@ function image_effect_form($form, &$form_state, $style, $effect) {
     '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'),
   );
   $form['buttons']['cancel'] = array(
-    '#markup' => l(t('Cancel'), 'admin/config/media/image-styles/edit/' . $style['name']),
+    '#type' => 'link',
+    '#title' => t('Cancel'),
+    '#href' => 'admin/config/media/image-styles/edit/' . $style['name'],
   );
 
   return $form;
diff --git a/modules/shortcut/shortcut.admin.inc b/modules/shortcut/shortcut.admin.inc
index 373c481ca..0baa368c2 100644
--- a/modules/shortcut/shortcut.admin.inc
+++ b/modules/shortcut/shortcut.admin.inc
@@ -175,7 +175,9 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
   );
 
   $form['change_set'] = array(
-    '#markup' => l(t('Change set'), 'admin/config/system/shortcut'),
+    '#type' => 'link',
+    '#title' => t('Change set'),
+    '#href' => 'admin/config/system/shortcut',
     '#prefix' => '<div class="shortcuts-change-set"> (',
     '#suffix' => ')</div>',
     '#weight' => -99,
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index 4607d4884..84b66948f 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -524,7 +524,10 @@ function shortcut_page_build(&$page) {
     $link_text = shortcut_set_switch_access() ? t('Add to %shortcut_set shortcuts', array('%shortcut_set' => $shortcut_set->title)) : t('Add to shortcuts');
     $page['add_to_shortcuts'] = array(
      '#prefix' => '<div class="add-to-shortcuts">',
-     '#markup' => l('<span class="icon"></span><span class="text">' . $link_text . '</span>', 'admin/config/system/shortcut/' . $shortcut_set->set_name . '/add-link-inline', array('query' => $query, 'html' => TRUE)),
+     '#type' => 'link',
+     '#title' => '<span class="icon"></span><span class="text">' . $link_text . '</span>',
+     '#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name . '/add-link-inline',
+     '#options' => array('query' => $query, 'html' => TRUE),
      '#suffix' => '</div>',
     );
   }
@@ -536,7 +539,12 @@ function shortcut_page_build(&$page) {
   $shortcut_set = shortcut_current_displayed_set();
   $configure_link = NULL;
   if (shortcut_set_edit_access($shortcut_set)) {
-    $configure_link = array('#markup' => l(t('edit shortcuts'), 'admin/config/system/shortcut/' . $shortcut_set->set_name, array('attributes' => array('id' => 'toolbar-customize'))));
+    $configure_link = array(
+      '#type' => 'link',
+      '#title' => t('edit shortcuts'),
+      '#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name,
+      '#options' => array('attributes' => array('id' => 'toolbar-customize')),
+    );
   }
 
   $drawer = array(
diff --git a/modules/simpletest/simpletest.pages.inc b/modules/simpletest/simpletest.pages.inc
index ba2588919..bd3f471d3 100644
--- a/modules/simpletest/simpletest.pages.inc
+++ b/modules/simpletest/simpletest.pages.inc
@@ -319,7 +319,9 @@ function simpletest_result_form($form, &$form_state, $test_id) {
   );
 
   $form['action']['return'] = array(
-    '#markup' => l(t('Return to list'), 'admin/config/development/testing'),
+    '#type' => 'link',
+    '#title' => t('Return to list'),
+    '#href' => 'admin/config/development/testing',
   );
 
   if (is_numeric($test_id)) {
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 877598119..4c85c47d3 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1762,7 +1762,9 @@ function system_date_time_settings() {
       // the system.
       if ($type_info['locked'] == 0) {
         $form['formats']['delete']['date_format_' . $type . '_delete'] = array(
-          '#markup' => l(t('delete'), 'admin/config/regional/date-time/types/' . $type . '/delete'),
+          '#type' => 'link',
+          '#title' => t('delete'),
+          '#href' => 'admin/config/regional/date-time/types/' . $type . '/delete',
         );
       }
     }