From c93ce14c283dc0a2c9426bb9b68f2be0284247b3 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Mon, 13 Nov 2006 22:17:56 +0000
Subject: [PATCH] Forgot to update changelog Added fatal error should parsing
 JSON config fail (thanks jZed__ on freenode #webgui)

---
 docs/changelog/7.x.x.txt | 3 +++
 lib/WebGUI/Config.pm     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5e1c7e7b4..e36bb94bb 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,9 @@
  - fix: entry in error log of WebGUI
  - Fixed part of RSSCapable addition upgrade script in 7.2.0.
  - fix: MIME types broken from change to the way File assets were streamed
+ - fix: New resizable textareas not obeying width/height parameters
+ - fix: InOutBoard not allowing re-editing of new revisions
+ - Added a fatal error should parsing of JSON config file fail
 
 7.2.0
  - Added server side spellchecker (Martin Kamerbeek / Procolix)
diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm
index fbea4903f..d8e7cc42b 100644
--- a/lib/WebGUI/Config.pm
+++ b/lib/WebGUI/Config.pm
@@ -340,6 +340,8 @@ sub new {
 			}
 			close($FILE);
 			my $conf = jsonToObj($json);
+			die "Couldn't parse JSON in config file '$filename'\n" 
+				unless ref $conf;
 			my $self = {_webguiRoot=>$webguiPath, _configFile=>$filename, _config=>$conf};
 			bless $self, $class;
 			$config{$filename} = $self unless $noCache;