Commit 00170776 authored by Crell's avatar Crell

Merge remote-tracking branch 'dries/8.x' into dbtngtng

parents bfd9882a 7ecad2da
......@@ -117,11 +117,11 @@ Drupal.behaviors.blockDrag = {
var select = $(this);
tableDrag.rowObject = new tableDrag.row(row);
// Find the correct region and insert the row as the last in the region.
// Find the correct region and insert the row as the first in the region.
$('tr.region-message', table).each(function () {
if ($(this).is('.region-' + select[0].value + '-message')) {
// Add the new row and remove the old one.
$(this).nextUntil('.region-title').last().after(row);
$(this).after(row);
// Manually update weights and restripe.
tableDrag.updateFields(row.get(0));
tableDrag.rowObject.changed = true;
......
......@@ -705,6 +705,7 @@ function hook_field_is_empty($item, $field) {
* @see hook_field_widget_form_alter()
* @see hook_field_widget_WIDGET_TYPE_form_alter()
* @see hook_field_widget_error()
* @see hook_field_widget_settings_form()
*/
function hook_field_widget_info() {
return array(
......
......@@ -579,6 +579,10 @@ function hook_node_load($nodes, $types) {
* block access, return NODE_ACCESS_IGNORE or simply return nothing.
* Blindly returning FALSE will break other node access modules.
*
* Also note that this function isn't called for node listings (e.g., RSS feeds,
* the default home page at path 'node', a recent content block, etc.) See
* @link node_access Node access rights @endlink for a full explanation.
*
* @param object|string $node
* Either a node object or the machine name of the content type on which to
* perform the access check.
......
......@@ -2921,13 +2921,14 @@ function node_search_validate($form, &$form_state) {
* that this table is a list of grants; any matching row is sufficient to
* grant access to the node.
*
* In node listings, the process above is followed except that
* hook_node_access() is not called on each node for performance reasons and for
* proper functioning of the pager system. When adding a node listing to your
* module, be sure to use a dynamic query created by db_select() and add a tag
* of "node_access". This will allow modules dealing with node access to ensure
* only nodes to which the user has access are retrieved, through the use of
* hook_query_TAG_alter().
* In node listings (lists of nodes generated from a select query, such as the
* default home page at path 'node', an RSS feed, a recent content block, etc.),
* the process above is followed except that hook_node_access() is not called on
* each node for performance reasons and for proper functioning of the pager
* system. When adding a node listing to your module, be sure to use a dynamic
* query created by db_select() and add a tag of "node_access". This will allow
* modules dealing with node access to ensure only nodes to which the user has
* access are retrieved, through the use of hook_query_TAG_alter().
*
* Note: Even a single module returning NODE_ACCESS_DENY from hook_node_access()
* will block access to the node. Therefore, implementers should take care to
......
......@@ -3753,7 +3753,7 @@ function hook_url_inbound_alter(&$path, $original_path, $path_language) {
* @param $path
* The outbound path to alter, not adjusted for path aliases yet. It won't be
* adjusted for path aliases until all modules are finished altering it, thus
* being consistent with hook_url_alter_inbound(), which adjusts for all path
* being consistent with hook_url_inbound_alter(), which adjusts for all path
* aliases before allowing modules to alter it. This may have been altered by
* other modules before this one.
* @param $options
......
......@@ -1226,6 +1226,8 @@ function taxonomy_vocabulary_load_multiple($vids = array(), $conditions = array(
* @return
* The vocabulary object with all of its metadata, if exists, FALSE otherwise.
* Results are statically cached.
*
* @see taxonomy_vocabulary_machine_name_load()
*/
function taxonomy_vocabulary_load($vid) {
$vocabularies = taxonomy_vocabulary_load_multiple(array($vid));
......@@ -1241,6 +1243,8 @@ function taxonomy_vocabulary_load($vid) {
* @return
* The vocabulary object with all of its metadata, if exists, FALSE otherwise.
* Results are statically cached.
*
* @see taxonomy_vocabulary_load()
*/
function taxonomy_vocabulary_machine_name_load($name) {
$vocabularies = taxonomy_vocabulary_load_multiple(NULL, array('machine_name' => $name));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment