prepare to tag v0.7.19

mosbth · Mar 30, 2017 · f960451 · f960451
1 parent 61aa528
commit f960451
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 38 deletions.
diff --git a/REVISION.md b/REVISION.md
@@ -5,9 +5,10 @@ Revision history
 [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
 
 
-v0.7.19* (2016-08-31)
+v0.7.19 (2017-03-31)
 -------------------------------------
 
+* Move exception handler from functions.php to img.php.
 * Correct XSS injection in `check_system.php`.
 * Composer suggests ext-imagick and ext-curl.
 

diff --git a/defines.php b/defines.php
@@ -1,6 +1,6 @@
 <?php
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.19* (2016-08-11)");
+define("CIMAGE_VERSION", "v0.7.19 (2017-03-31)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);

diff --git a/webroot/imgd.php b/webroot/imgd.php
@@ -38,7 +38,7 @@
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.18 (2016-08-09)");
+define("CIMAGE_VERSION", "v0.7.19 (2017-03-31)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -118,22 +118,6 @@ function errorPage($msg, $type = 500)
 
 
 
-/**
- * Custom exception handler.
- */
-set_exception_handler(function ($exception) {
-    errorPage(
-        "<p><b>img.php: Uncaught exception:</b> <p>"
-        . $exception->getMessage()
-        . "</p><pre>"
-        . $exception->getTraceAsString()
-        . "</pre>",
-        500
-    );
-});
-
-
-
 /**
  * Get input from query string or return default value if not set.
  *
@@ -4418,6 +4402,22 @@ public function output()
  *
  */
 
+/**
+ * Custom exception handler.
+ */
+set_exception_handler(function ($exception) {
+    errorPage(
+        "<p><b>img.php: Uncaught exception:</b> <p>"
+        . $exception->getMessage()
+        . "</p><pre>"
+        . $exception->getTraceAsString()
+        . "</pre>",
+        500
+    );
+});
+
+
+
 /**
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.

diff --git a/webroot/imgp.php b/webroot/imgp.php
@@ -38,7 +38,7 @@
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.18 (2016-08-09)");
+define("CIMAGE_VERSION", "v0.7.19 (2017-03-31)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -118,22 +118,6 @@ function errorPage($msg, $type = 500)
 
 
 
-/**
- * Custom exception handler.
- */
-set_exception_handler(function ($exception) {
-    errorPage(
-        "<p><b>img.php: Uncaught exception:</b> <p>"
-        . $exception->getMessage()
-        . "</p><pre>"
-        . $exception->getTraceAsString()
-        . "</pre>",
-        500
-    );
-});
-
-
-
 /**
  * Get input from query string or return default value if not set.
  *
@@ -4418,6 +4402,22 @@ public function output()
  *
  */
 
+/**
+ * Custom exception handler.
+ */
+set_exception_handler(function ($exception) {
+    errorPage(
+        "<p><b>img.php: Uncaught exception:</b> <p>"
+        . $exception->getMessage()
+        . "</p><pre>"
+        . $exception->getTraceAsString()
+        . "</pre>",
+        500
+    );
+});
+
+
+
 /**
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.