Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
b58ae22d
Commit
b58ae22d
authored
Jan 27, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Jan 27, 2015
Browse files
Merge "Allow default null $value in get_records_* methods"
parents
46e3f75e
f0973c63
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/dml.php
View file @
b58ae22d
...
...
@@ -639,7 +639,7 @@ function get_records_select_array($table, $select='', array $values=null, $sort=
* @return mixed an array of objects, or false if no records were found.
* @throws SQLException
*/
function
get_records_sql_assoc
(
$sql
,
array
$values
,
$limitfrom
=
''
,
$limitnum
=
''
)
{
function
get_records_sql_assoc
(
$sql
,
array
$values
=
null
,
$limitfrom
=
''
,
$limitnum
=
''
)
{
$rs
=
get_recordset_sql
(
$sql
,
$values
,
$limitfrom
,
$limitnum
);
return
recordset_to_assoc
(
$rs
);
}
...
...
@@ -656,7 +656,7 @@ function get_records_sql_assoc($sql, array $values, $limitfrom='', $limitnum='')
* @return mixed an array of objects, or false if no records were found.
* @throws SQLException
*/
function
get_records_sql_array
(
$sql
,
array
$values
,
$limitfrom
=
''
,
$limitnum
=
''
)
{
function
get_records_sql_array
(
$sql
,
array
$values
=
null
,
$limitfrom
=
''
,
$limitnum
=
''
)
{
$rs
=
get_recordset_sql
(
$sql
,
$values
,
$limitfrom
,
$limitnum
);
return
recordset_to_array
(
$rs
);
}
...
...
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