Merge branch 'master' into kohana_3

Conflicts: lib/uploadify/uploadify.swf.php modules/gallery/helpers/data_rest.php modules/gallery/orphans/views/form_uploadify.html.php modules/gallery/tests/File_Structure_Test.php modules/info/classes/Info/Hook/InfoBlock.php modules/info/classes/Info/Hook/InfoInstaller.php
gallery · Jun 12, 2013 · 1756203 · 1756203
2 parents 210a1cb + a3d06cc
commit 1756203
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.build_number b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=418
+build_number=422
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: php
 php:
   - 5.3
   - 5.4
-  - 5.5
 
 branches:
   only:

diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
@@ -169,6 +169,10 @@ public function test_code_files_start_with_preamble() {
         // Front controllers
         break;
 
+      case DOCROOT . "lib/mediaelementjs/flashmediaelement.swf.php":
+        // SWF wrappers - directly accessible
+        break;
+
       case DOCROOT . "local.php":
         // Special case optional file, not part of the codebase
         break;

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
@@ -180,7 +180,7 @@ modules/gallery/views/error_admin.html.php                   286 DIRTY_ATTR $env
 modules/gallery/views/error_admin.html.php                   296 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                16  DIRTY_JS url::site("uploader/status/_S/_E")
 modules/gallery/views/form_uploadify.html.php                24  DIRTY_JS $flash_minimum_version
-modules/gallery/views/form_uploadify.html.php                28  DIRTY_JS url::file("lib/uploadify/uploadify.php")
+modules/gallery/views/form_uploadify.html.php                28  DIRTY_JS url::file("lib/uploadify/uploadify.swf.php")
 modules/gallery/views/form_uploadify.html.php                29  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                31  DIRTY_JS implode(";",$extensions)
 modules/gallery/views/form_uploadify.html.php                33  DIRTY_JS url::file("lib/uploadify/cancel.png")

diff --git a/modules/info/classes/Info/Hook/InfoBlock.php b/modules/info/classes/Info/Hook/InfoBlock.php
@@ -75,11 +75,10 @@ static function get($block_id, $theme) {
         if (($theme->item->width && $theme->item->height) &&
             Module::get_var("info", "show_dimensions")) {
             $info["size"] = array(
-                "label" => t("Dimensions:"),
-                "value" => t(
-                  "%width x %height px",
-                  array("width" => $theme->item->width, "height" => $theme->item->height))
-            );
+              "label" => t("Dimensions:"),
+              "value" => t(
+                "%width x %height px",
+                array("width" => $theme->item->width, "height" => $theme->item->height)));
         }
 
         $block->content->metadata = $info;