diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 | 
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 | 
| commit | 0d9c5c1ccd66018a819b4ca327ab203f473e35dc (patch) | |
| tree | f55e5caa8bf8036b02fc553eecd2b615791d2ce5 /engine/lib/metastrings.php | |
| parent | ca63a6b81eee1dfbee99a393a790402475a4612c (diff) | |
| parent | d928588805375e7190ab393e2def555b39701a27 (diff) | |
| download | elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.gz elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/lib/metastrings.php')
| -rw-r--r-- | engine/lib/metastrings.php | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php index 796655569..983716925 100644 --- a/engine/lib/metastrings.php +++ b/engine/lib/metastrings.php @@ -322,7 +322,7 @@ function elgg_get_metastring_based_objects($options) {  		'metastring_owner_guid', 'metastring_id',  		'select', 'where', 'join'  	); -	 +  	$options = elgg_normalise_plural_options_array($options, $singulars);  	if (!$options) { @@ -463,7 +463,7 @@ function elgg_get_metastring_based_objects($options) {  		if ($options['limit']) {  			$limit = sanitise_int($options['limit']); -			$offset = sanitise_int($options['offset']); +			$offset = sanitise_int($options['offset'], false);  			$query .= " LIMIT $offset, $limit";  		} | 
