From 8fe4e41b5bee63007314f47e9c5b78c55e8218d5 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 3 Mar 2012 13:10:43 +0100 Subject: [PATCH] =?UTF-8?q?J=C3=B3n=20Gnarr=20fixed=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/admin/images.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index 2a95d279..29e12de1 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -553,6 +553,7 @@ switch ($serendipity['GET']['adminAction']) { 'maxImgHeight' => $serendipity['maxImgHeight'], 'maxImgWidth' => $serendipity['maxImgWidth'], ); + // ToDo later: merge $data and $media $serendipity['smarty']->assign('media', $mediaFiles); $serendipity['smarty']->display(serendipity_getTemplateFile('admin/media_upload.tpl', 'serendipityPath')); break; @@ -680,7 +681,8 @@ function showMediaLibrary($messages=false, $addvar_check = false) { ); } -$data['get'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime +$data['get']['fid'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime +$data['get']['only_path'] = $serendipity['GET']['only_path']; // we dont need other GET vars in images.inc.tpl if (!is_object($serendipity['smarty'])) { serendipity_smarty_init();