diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-05-24 12:12:57 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-05-24 12:12:57 +0000 |
| commit | 9569b43035de9645e82271896e302c8d082d960a (patch) | |
| tree | 4dffbc9117e84d5fb9cf0a5806bf51ff2086ee95 /modules/gallery/views | |
| parent | 3908e37d965fa76ea774e76ddf42365a872a5f27 (diff) | |
| parent | b7177cfb2dcfb8b057a15757943c5e733d6c8917 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/error_admin.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php index cd1bd569..036e2049 100644 --- a/modules/gallery/views/error_admin.html.php +++ b/modules/gallery/views/error_admin.html.php @@ -289,7 +289,7 @@ <tr> <td class="key"> <code> - <?= $key?> + <?= html::purify($key) ?> </code> </td> <td class="value"> diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index c13e3418..4963d185 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -25,7 +25,7 @@ $("#g-uploadify").uploadify({ width: 298, height: 32, - uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", + uploader: "<?= url::file("lib/uploadify/uploadify.php") ?>", script: "<?= url::site("uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, fileExt: "<?= implode(";", $extensions) ?>", |