diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
| commit | 8702de7f7e170bddfdb622c393c3cac3446fd1c5 (patch) | |
| tree | c7269ea61f5d4230a6f916dbabee4ce412e0a9fb /inc/media.php | |
| parent | 1cc82e5c76ae7fcd646e448404afdc0fd458bf55 (diff) | |
| parent | 9a0ca2cfd8ac42895af3be2efbd2cab7e6d33578 (diff) | |
| download | rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.gz rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into scrutinizerissues
Conflicts:
inc/media.php
inc/plugin.php
inc/template.php
lib/plugins/authplain/_test/escaping.test.php
lib/plugins/syntax.php
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/media.php b/inc/media.php index 4ad67369d..c77f3f952 100644 --- a/inc/media.php +++ b/inc/media.php @@ -636,11 +636,11 @@ function media_notify($id,$file,$mime,$old_rev=false){ /** * List all files in a given Media namespace * - * @param string $ns + * @param string $ns namespace * @param null|int $auth permission level * @param string $jump id * @param bool $fullscreenview - * @param bool|string $sort sorting order + * @param bool|string $sort sorting order, false skips sorting */ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=false){ global $conf; |