opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

Browse source
This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/modules/taxonomy/src/VocabularyForm.php
View file

@ -7,18 +7,17 @@
namespace Drupal\taxonomy;
use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Entity\BundleEntityFormBase;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Entity\ContentLanguageSettings;
use Drupal\taxonomy\VocabularyStorageInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base form for vocabulary edit forms.
*/
class VocabularyForm extends EntityForm {
class VocabularyForm extends BundleEntityFormBase {
/**
* The vocabulary storage.
@ -112,7 +111,8 @@ class VocabularyForm extends EntityForm {
'#value' => '0',
);
return parent::form($form, $form_state, $vocabulary);
$form = parent::form($form, $form_state);
return $this->protectBundleIdElement($form);
}
/**
@ -147,14 +147,14 @@ class VocabularyForm extends EntityForm {
/**
* Determines if the vocabulary already exists.
*
* @param string $id
* The vocabulary ID
* @param string $vid
* The vocabulary ID.
*
* @return bool
* TRUE if the vocabulary exists, FALSE otherwise.
*/
public function exists($id) {
$action = $this->vocabularyStorage->load($id);
public function exists($vid) {
$action = $this->vocabularyStorage->load($vid);
return !empty($action);
}