Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 18 insertions, 0 deletions

diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
new file mode 100644
index 00000000..27c293ce
--- /dev/null
+++ b/themes/wind/views/movie.html.php
@@ -0,0 +1,18 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-item">
+  <?= $theme->photo_top() ?>
+
+  <?= $theme->paginator() ?>
+
+  <div id="g-movie" class="ui-helper-clearfix">
+    <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
+    <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
+  </div>
+
+  <div id="g-info">
+    <h1><?= html::purify($item->title) ?></h1>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
+  </div>
+
+  <?= $theme->photo_bottom() ?>
+</div>