diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php index 8a776cb..2c2fa2c 100644 --- a/core/lib/Drupal/Core/Controller/HtmlFormController.php +++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php @@ -63,8 +63,7 @@ public function content(Request $request, $_form) { $form_state['build_info']['args'] = $args; $form_id = _drupal_form_id($form_object, $form_state); - $form = drupal_build_form($form_id, $form_state); - return $form; + return drupal_build_form($form_id, $form_state); } /** diff --git a/core/lib/Drupal/Core/HttpKernel.php b/core/lib/Drupal/Core/HttpKernel.php index d80ddfb..18b2f14 100644 --- a/core/lib/Drupal/Core/HttpKernel.php +++ b/core/lib/Drupal/Core/HttpKernel.php @@ -64,11 +64,15 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ /** * Forwards the request to another controller. * - * @param string $controller The controller name (a string like BlogBundle:Post:index) - * @param array $attributes An array of request attributes - * @param array $query An array of request query parameters + * @param string|NULL $controller + * The controller name (a string like BlogBundle:Post:index). + * @param array $attributes + * An array of request attributes. + * @param array $query + * An array of request query parameters. * - * @return Response A Response instance + * @return Response + * A Response instance */ public function forward($controller, array $attributes = array(), array $query = array()) {