2c2
< index 151bb23..01fd1b6 100644
---
> index 0b4af2d..7e35d78 100644
5c5
< @@ -305,4 +305,23 @@ protected function pathAliasWhitelistRebuild($source = NULL) {
---
> @@ -256,4 +256,27 @@ protected function pathAliasWhitelistRebuild($source = NULL) {
24,25c24,29
< +    $query = 'SELECT pid FROM {url_alias} WHERE pid != :pid AND alias = :alias AND langcode = :langcode LIMIT 1';
< +    return (bool) $this->connection->query($query, array(':pid' => $pid, ':alias' => $alias, ':langcode' => $langcode))->fetchField();
---
> +    $result = $this->path->load(array(
> +      'pid' => $pid,
> +      'alias' => $alias,
> +      'langcode' => $langcode,
> +    ));
> +    return !empty($result);
549c553
< index 4f94f43..16ae839 100644
---
> index 683bac0..9b957eb 100644
576c580
< index b2941a0..0000000
---
> index d22fe66..0000000
579c583
< @@ -1,327 +0,0 @@
---
> @@ -1,331 +0,0 @@
596c600,601
< - * @deprecated Use \Drupal\path\Controller\PathController::adminOverview()
---
> - * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
> - *   Use \Drupal\path\Controller\PathController::adminOverview().
639c644
< -      $row['data']['language_name'] = language_name($data->langcode);
---
> -      $row['data']['language_name'] = \Drupal::languageManager()->getLanguageName($data->langcode);
670c675
< -    '#theme' => 'table',
---
> -    '#type' => 'table',
691c696,697
< - * @deprecated Use \Drupal\path\Controller\PathController::adminEdit() or
---
> - * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0. Use
> - *   \Drupal\path\Controller\PathController::adminAdd() or
863c869,870
< -  $form['basic'] = array('#type' => 'details',
---
> -  $form['basic'] = array(
> -    '#type' => 'details',
864a872
> -    '#open' => TRUE,
924,942d931
< diff --git a/core/modules/path/path.module b/core/modules/path/path.module
< index 8e96610..d6e5824 100644
< --- a/core/modules/path/path.module
< +++ b/core/modules/path/path.module
< @@ -63,14 +63,6 @@ function path_menu() {
<      'route_name' => 'path.admin_overview',
<      'weight' => -5,
<    );
< -  $items['admin/config/search/path/edit/%path'] = array(
< -    'title' => 'Edit alias',
< -    'route_name' => 'path.admin_edit',
< -  );
< -  $items['admin/config/search/path/delete/%path'] = array(
< -    'title' => 'Delete alias',
< -    'route_name' => 'path.delete',
< -  );
<  
<    return $items;
<  }