security update core+modules
This commit is contained in:
@@ -6,9 +6,9 @@ files[] = entity_feature.module
|
||||
dependencies[] = entity_test
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by drupal.org packaging script on 2012-12-25
|
||||
version = "7.x-1.0"
|
||||
; Information added by Drupal.org packaging script on 2015-02-25
|
||||
version = "7.x-1.6"
|
||||
core = "7.x"
|
||||
project = "entity"
|
||||
datestamp = "1356471145"
|
||||
datestamp = "1424876582"
|
||||
|
||||
|
@@ -7,9 +7,9 @@ files[] = entity_test.install
|
||||
dependencies[] = entity
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by drupal.org packaging script on 2012-12-25
|
||||
version = "7.x-1.0"
|
||||
; Information added by Drupal.org packaging script on 2015-02-25
|
||||
version = "7.x-1.6"
|
||||
core = "7.x"
|
||||
project = "entity"
|
||||
datestamp = "1356471145"
|
||||
datestamp = "1424876582"
|
||||
|
||||
|
@@ -51,8 +51,14 @@ function entity_test_schema() {
|
||||
'uid' => array('uid'),
|
||||
),
|
||||
'foreign keys' => array(
|
||||
'uid' => array('users' => 'uid'),
|
||||
'name' => array('entity_test_types' => 'name'),
|
||||
'uid' => array(
|
||||
'table' => 'users',
|
||||
'columns' => array('uid' => 'uid')
|
||||
),
|
||||
'name' => array(
|
||||
'table' => 'entity_test_types',
|
||||
'columns' => array('name' => 'name')
|
||||
),
|
||||
),
|
||||
'primary key' => array('pid'),
|
||||
);
|
||||
|
@@ -267,8 +267,15 @@ function entity_test_entity_getter($node) {
|
||||
if (empty($node->entity)) {
|
||||
$node->entity = array('type' => 'user', 'id' => $node->uid);
|
||||
}
|
||||
|
||||
// We have to return the entity wrapped.
|
||||
return entity_metadata_wrapper($node->entity['type'], $node->entity['id']);
|
||||
// Special handling for anonymous user.
|
||||
if ($node->entity['type'] === 'user' && empty($node->entity['id'])) {
|
||||
return entity_metadata_wrapper('user', drupal_anonymous_user());
|
||||
}
|
||||
else {
|
||||
return entity_metadata_wrapper($node->entity['type'], $node->entity['id']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -5,9 +5,9 @@ dependencies[] = i18n_string
|
||||
package = Multilingual - Internationalization
|
||||
core = 7.x
|
||||
hidden = TRUE
|
||||
; Information added by drupal.org packaging script on 2012-12-25
|
||||
version = "7.x-1.0"
|
||||
; Information added by Drupal.org packaging script on 2015-02-25
|
||||
version = "7.x-1.6"
|
||||
core = "7.x"
|
||||
project = "entity"
|
||||
datestamp = "1356471145"
|
||||
datestamp = "1424876582"
|
||||
|
||||
|
Reference in New Issue
Block a user