diff --git a/includes/theme.inc b/includes/theme.inc
index c211248..ac310cd 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1371,7 +1371,7 @@ function theme_status_messages($variables) {
  * @see l()
  */
 function theme_link($variables) {
-  return '<a href="' . check_plain(url($variables['path'], $variables['options'])) . '"' . drupal_attributes($variables['options']['attributes']) . '>' . ($variables['options']['html'] ? $variables['text'] : check_plain($variables['text'])) . '</a>';
+  return '<a href="' . check_plain(url($variables['path'], $variables['options'])) . '"' . drupal_attributes($variables['options']['attributes']) . '>' . (!empty($variables['options']['html']) ? $variables['text'] : check_plain($variables['text'])) . '</a>';
 }
 
 /**