summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-12-11 16:20:41 (GMT)
committerAlex Pott2014-12-11 16:20:41 (GMT)
commit6031d0bb00de039c8a3363018b3d262e3b59354d (patch)
tree73ff93d9196e647363a654e9272a8fb47c19bc13
parent1ffac67513893c1eadaba439d8452390418fb416 (diff)
Issue #2384527 by tadityar, areke, rpayanm, preshetin: Make the class variables protected for ShortcutSet
-rw-r--r--core/modules/shortcut/shortcut.module2
-rw-r--r--core/modules/shortcut/src/Entity/ShortcutSet.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 696a381..ba9c43d 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -227,7 +227,7 @@ function shortcut_default_set($account = NULL) {
function shortcut_set_title_exists($title) {
$sets = ShortcutSet::loadMultiple();
foreach ($sets as $set) {
- if ($set->label == $title) {
+ if ($set->label() == $title) {
return TRUE;
}
}
diff --git a/core/modules/shortcut/src/Entity/ShortcutSet.php b/core/modules/shortcut/src/Entity/ShortcutSet.php
index da60378..f72b7d0 100644
--- a/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -49,14 +49,14 @@ class ShortcutSet extends ConfigEntityBase implements ShortcutSetInterface {
*
* @var string
*/
- public $id;
+ protected $id;
/**
* The human-readable name of the configuration entity.
*
* @var string
*/
- public $label;
+ protected $label;
/**
* {@inheritdoc}