commit 6a7766410106857eda83650dbac777241e030ba5 Author: kgoel Date: Fri May 17 16:49:15 2013 -0400 Issue# 1978976 diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetSwitch.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetSwitch.php index 7b45fdb..6de87f2 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetSwitch.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetSwitch.php @@ -13,7 +13,7 @@ use Drupal\menu_link\MenuLinkStorageContainer; use Drupal\shortcut\Plugin\Core\Entity\shortcut; use Drupal\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\Request; +Use Drupal\Component\Utility\String; /** * Builds the shortcut set switch form. @@ -42,8 +42,7 @@ public function __construct(EntityManager $entity_manager) { */ public static function create(ContainerInterface $container) { return new static( - $container->get('plugin.manager.entity') - $container->get('request') + $container->get('plugin.manager.entity')->get('request') ); } @@ -69,7 +68,7 @@ public function buildForm($form, &$form_state, $account = NULL) { $options = array(); foreach ($sets as $name => $set) { - $options[$name] = check_plain($set->label()); + $options[$name] = String::check_plain($set->label()); } // Only administrators can add shortcut sets.