From 4d319b34249ebee9a72fdd1c1d8022d893313a42 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 18 Sep 2013 10:30:12 +0200
Subject: [PATCH] Merged in changed from drupal git.

---
 h5p.classes.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/h5p.classes.php b/h5p.classes.php
index 29ce875..0068902 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -90,10 +90,10 @@ interface H5PFrameworkInterface {
    *  FALSE otherwise
    */
   public function isPatchedLibrary($library);
-  
+
   /**
    * Is H5P in development mode?
-   * 
+   *
    * @return boolean
    *  TRUE if H5P development mode is active
    *  FALSE otherwise
@@ -784,12 +784,12 @@ class H5PValidator {
    */
   private function getJsonData($filePath, $return_as_string = FALSE) {
     $json = file_get_contents($filePath);
-    if (!$json) {
-      return FALSE;
+    if ($json === FALSE) {
+      return FALSE; // Cannot read from file.
     }
     $jsonData = json_decode($json, TRUE);
-    if (!$jsonData) {
-      return FALSE;
+    if ($jsonData === NULL) {
+      return FALSE; // JSON cannot be decoded or the recursion limit has been reached.
     }
     return $return_as_string ? $json : $jsonData;
   }