From bcc5d5116ee218c7fd2d3d9af49fbdcd4d78b611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Wrzeszcz?= <rafal.wrzeszcz@wrzasq.pl>
Date: Sat, 10 Dec 2011 23:10:08 +0100
Subject: [PATCH] Moved options merging before query parameter parsing.

---
 jsdoc.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jsdoc.js b/jsdoc.js
index beaf2b22..28ceca8a 100644
--- a/jsdoc.js
+++ b/jsdoc.js
@@ -155,10 +155,6 @@ function main() {
         throw('Configuration file cannot be evaluated. '+e);
     }
     
-    if (env.opts.query) {
-        env.opts.query = require('query').toObject(env.opts.query);
-    }
-    
     // allow to pass arguments from configuration file
     if (env.conf.opts) {
         for (var opt in env.conf.opts) {
@@ -169,6 +165,10 @@ function main() {
         }
     }
     
+    if (env.opts.query) {
+        env.opts.query = require('query').toObject(env.opts.query);
+    }
+    
     // which version of javascript will be supported? (rhino only)
     if (typeof version === 'function') {
         version(env.conf.jsVersion || 180);