Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
drupal.org
realname
Commits
9d65522f
Commit
9d65522f
authored
Feb 23, 2014
by
hass
Browse files
Issue #2182881 by hass: stdClass type hinting breaks real entity objects
parent
111b717d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
23 deletions
+24
-23
realname.api.php
realname.api.php
+4
-4
realname.module
realname.module
+20
-19
No files found.
realname.api.php
View file @
9d65522f
...
...
@@ -13,9 +13,9 @@
/**
* Alter the pattern for a user's real name prior to generation.
*
* @param $pattern
* @param
string
$pattern
* The real name pattern string prior to token replacement.
* @param $account
* @param
object
$account
* A user account object.
*
* @see realname_update()
...
...
@@ -29,9 +29,9 @@ function hook_realname_pattern_alter(&$pattern, $account) {
/**
* Alter a user's real name before it is saved to the database.
*
* @param $realname
* @param
string
$realname
* The user's generated real name.
* @param $account
* @param
object
$account
* A user account object.
*
* @see realname_update()
...
...
realname.module
View file @
9d65522f
...
...
@@ -102,7 +102,7 @@ function realname_username_alter(&$name, $account) {
/**
* Implements hook_user_load().
*/
function
realname_user_load
(
array
$accounts
)
{
function
realname_user_load
(
$accounts
)
{
$realnames
=
realname_load_multiple
(
$accounts
);
foreach
(
$realnames
as
$uid
=>
$realname
)
{
$accounts
[
$uid
]
->
realname
=
$realname
;
...
...
@@ -112,7 +112,7 @@ function realname_user_load(array $accounts) {
/**
* Implements hook_user_update().
*/
function
realname_user_update
(
array
&
$edit
,
stdClass
$account
,
$category
)
{
function
realname_user_update
(
&
$edit
,
$account
,
$category
)
{
// Since user data may have changed, update the realname.
realname_update
(
$account
);
}
...
...
@@ -120,7 +120,7 @@ function realname_user_update(array &$edit, stdClass $account, $category) {
/**
* Implements hook_user_delete().
*/
function
realname_user_delete
(
stdClass
$account
)
{
function
realname_user_delete
(
$account
)
{
realname_delete
(
$account
->
uid
);
}
...
...
@@ -138,10 +138,10 @@ function realname_user_operations() {
/**
* Callback function for admin mass generating user real names.
*
* @param $uids
* @param
array
$uids
* An array of user IDs.
*/
function
realname_user_operations_realname_update
(
array
$uids
)
{
function
realname_user_operations_realname_update
(
$uids
)
{
$accounts
=
user_load_multiple
(
$uids
);
foreach
(
$accounts
as
$account
)
{
realname_update
(
$account
);
...
...
@@ -203,12 +203,12 @@ function realname_views_api() {
/**
* Loads a real name.
*
* @param $uid
* @param
object
$uid
* A user account object.
* @return
* @return
string
* The user's generated real name.
*/
function
realname_load
(
stdClass
$account
)
{
function
realname_load
(
$account
)
{
$realnames
=
realname_load_multiple
(
array
(
$account
->
uid
=>
$account
));
return
reset
(
$realnames
);
}
...
...
@@ -216,12 +216,12 @@ function realname_load(stdClass $account) {
/**
* Loads multiple real names.
*
* @param $accounts
* @param
array
$accounts
* An array of user account objects keyed by user ID.
* @return
* @return
array
* An array of real names keyed by user ID.
*/
function
realname_load_multiple
(
array
$accounts
)
{
function
realname_load_multiple
(
$accounts
)
{
$realnames
=
&
drupal_static
(
__FUNCTION__
,
array
());
if
(
$new_accounts
=
array_diff_key
(
$accounts
,
$realnames
))
{
...
...
@@ -243,7 +243,7 @@ function realname_load_multiple(array $accounts) {
/**
* Update the realname for a user account.
*
* @param $account
* @param
object
$account
* A user account object.
*
* @see hook_realname_pattern_alter()
...
...
@@ -289,7 +289,7 @@ function realname_update($account) {
/**
* Delete a real name.
*
* @param $uid
* @param
int
$uid
* A user ID.
*/
function
realname_delete
(
$uid
)
{
...
...
@@ -299,10 +299,10 @@ function realname_delete($uid) {
/**
* Delete multiple real names.
*
* @param $uids
* @param
array
$uids
* An array of user IDs.
*/
function
realname_delete_multiple
(
array
$uids
)
{
function
realname_delete_multiple
(
$uids
)
{
db_delete
(
'realname'
)
->
condition
(
'uid'
,
$uids
,
'IN'
)
->
execute
();
drupal_static_reset
(
'realname_load_multiple'
);
entity_get_controller
(
'user'
)
->
resetCache
(
$uids
);
...
...
@@ -378,13 +378,14 @@ function realname_autocomplete($field_name, $entity_type, $bundle_name, $string
/**
* Menu Access callback for the autocomplete widget.
*
* @param $field_name
* @param
string
$field_name
* The name of the entity-reference field.
* @param $entity_type
* @param
string
$entity_type
* The entity type.
* @param $bundle_name
* @param
string
$bundle_name
* The bundle name.
* @return
*
* @return boolean
* True if user can access this menu item.
*/
function
realname_autocomplete_access_callback
(
$field_name
,
$entity_type
,
$bundle_name
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment