diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:17:56 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:17:56 -0700 |
| commit | dd55b4b87cb1c89ceeb45ccf49ce648339a86041 (patch) | |
| tree | 035059f5f06a2f6595110aff7c620380b46af103 /engine/lib/plugins.php | |
| parent | bfdb9bb8a87a29038ba1ae25355684ae19678fdd (diff) | |
| parent | ad016fd1254aa03afa7c24fdb82b35faa3c5019f (diff) | |
| download | elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.gz elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/lib/plugins.php')
| -rw-r--r-- | engine/lib/plugins.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index fd85ed9f0..365ef6fdf 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -978,7 +978,7 @@ function elgg_unset_all_plugin_settings($plugin_id = null) { * plugin_user_setting_name_value_pairs_operator => NULL|STR The operator to use for combining * (name = value) OPERATOR (name = value); default AND * - * @return mixed + * @return mixed int if count is true, an array of entity objects, or false on failure */ function elgg_get_entities_from_plugin_user_settings(array $options = array()) { // if they're passing it don't bother |