summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-01-30 05:29:45 (GMT)
committerwebchick2013-01-30 05:29:45 (GMT)
commit8fa982af2e4cf1a6bdc4a425087aa36032efb7a5 (patch)
tree69ea4c06b8ae079c74f165b75e70338816256898
parent290ceb42913c68a536ddf93b9ea7bc079a19d6b8 (diff)
Issue #1896922 by Albert Volkman: Fixed Remove NodeController reference.
-rw-r--r--core/modules/node/node.api.php26
-rw-r--r--core/modules/shortcut/shortcut.admin.inc3
2 files changed, 16 insertions, 13 deletions
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 5e5b270..f4e3d3d 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -563,12 +563,13 @@ function hook_node_create(\Drupal\node\Plugin\Core\Entity\Node $node) {
* for all available nodes should be loaded in a single query where possible.
*
* This hook is invoked during node loading, which is handled by entity_load(),
- * via classes NodeController and Drupal\Core\Entity\DatabaseStorageController.
- * After the node information is read from the database or the entity cache,
- * hook_load() is invoked on the node's content type module, then
- * field_attach_load_revision() or field_attach_load() is called, then
- * hook_entity_load() is invoked on all implementing modules, and finally
- * hook_node_load() is invoked on all implementing modules.
+ * via classes Drupal\node\NodeStorageController and
+ * Drupal\Core\Entity\DatabaseStorageController. After the node information is
+ * read from the database or the entity cache, hook_load() is invoked on the
+ * node's content type module, then field_attach_load_revision() or
+ * field_attach_load() is called, then hook_entity_load() is invoked on all
+ * implementing modules, and finally hook_node_load() is invoked on all
+ * implementing modules.
*
* @param $nodes
* An array of the nodes being loaded, keyed by nid.
@@ -1216,12 +1217,13 @@ function hook_insert(Drupal\node\Node $node) {
* (use hook_node_load() to respond to all node loads).
*
* This hook is invoked during node loading, which is handled by entity_load(),
- * via classes NodeController and Drupal\Core\Entity\DatabaseStorageController.
- * After the node information is read from the database or the entity cache,
- * hook_load() is invoked on the node's content type module, then
- * field_attach_node_revision() or field_attach_load() is called, then
- * hook_entity_load() is invoked on all implementing modules, and finally
- * hook_node_load() is invoked on all implementing modules.
+ * via classes Drupal\node\NodeStorageController and
+ * Drupal\Core\Entity\DatabaseStorageController. After the node information is
+ * read from the database or the entity cache, hook_load() is invoked on the
+ * node's content type module, then field_attach_node_revision() or
+ * field_attach_load() is called, then hook_entity_load() is invoked on all
+ * implementing modules, and finally hook_node_load() is invoked on all
+ * implementing modules.
*
* This hook should only be used to add information that is not in the node or
* node revisions table, not to replace information that is in these tables
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index d0cf7c1..d46e73b 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -214,7 +214,8 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
$form['shortcuts']['links'][$mlid]['name']['#markup'] = l($link['link_title'], $link['link_path']);
$form['shortcuts']['links'][$mlid]['weight'] = array(
'#type' => 'weight',
- '#title' => t('Weight'),
+ '#title' => t('Weight for @title', array('@title' => $link['link_title'])),
+ '#title_display' => 'invisible',
'#delta' => 50,
'#default_value' => $link['weight'],
'#attributes' => array('class' => array('shortcut-weight')),