summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build_number2
-rw-r--r--index.php7
2 files changed, 8 insertions, 1 deletions
diff --git a/.build_number b/.build_number
index 0fd63b7b..0fd37b2e 100644
--- 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=338
+build_number=339
diff --git a/index.php b/index.php
index 5f6d231b..c39452ea 100644
--- a/index.php
+++ b/index.php
@@ -29,6 +29,13 @@ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
exit("Gallery is not supported on Windows (PHP reports that you're using: " . PHP_OS . ")");
}
+// Gallery doesn't use Zend Guard code obfuscation, and Kohana 2.4 will not work if level is 3+.
+if (function_exists("zend_current_obfuscation_level") && (zend_current_obfuscation_level() >= 3)) {
+ exit("Gallery doesn't use Zend Guard code obfuscation, and is incompatible if it's running " .
+ "with a level of 3 or higher. For Gallery to run, please edit your main php.ini file and " .
+ "change/add the following line: 'zend_loader.obfuscation_level_support = 2'");
+}
+
// PHP 5.4 requires a timezone - if one isn't set date functions aren't going to work properly.
// We'll log this once the logging system is initialized (in the gallery_event::gallery_ready).
if (!ini_get("date.timezone")) {