From 3ccea2b6d71893cb977e3b2274bff8e419a4bdfa Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 6 Jun 2016 11:03:22 +0200
Subject: [PATCH] fix missing (global) namespace in Exception from last commit,
 also fixed existing cases

---
 api/src/Storage/Merge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 1ddddf8785..2140ad1eec 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -232,7 +232,7 @@ abstract class Merge
 						try {
 							$value = Api\DateTime::to($value, true);
 						}
-						catch (Exception $e) {
+						catch (\Exception $e) {
 							unset($e);	// ignore exception caused by wrongly formatted date
 						}
 					}
@@ -1280,7 +1280,7 @@ abstract class Merge
 								Api\DateTime::$user_timezone
 							);
 							if($date) break;
-						} catch (Exception $e) {
+						} catch (\Exception $e) {
 
 						}
 					}
@@ -1630,7 +1630,7 @@ abstract class Merge
 			{
 				$this->apply_styles($merged, $mimetype);
 			}
-			catch (Exception $e)
+			catch (\Exception $e)
 			{
 				// Error converting HTML styles over
 				error_log($e->getMessage());