From bcedb6df7efd86695816b059028bc628ddb37408 Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <apasotti@boundlessgeo.com>
Date: Sat, 10 Dec 2016 16:41:36 +0100
Subject: [PATCH] Moved interface to main init

---
 src/server/qgsserver.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
index 41c213ec3f1..c4a25c97801 100644
--- a/src/server/qgsserver.cpp
+++ b/src/server/qgsserver.cpp
@@ -394,6 +394,11 @@ bool QgsServer::init( )
 #endif
 
   QgsEditorWidgetRegistry::initEditors();
+
+#ifdef HAVE_SERVER_PYTHON_PLUGINS
+  sServerInterface = new QgsServerInterfaceImpl( sCapabilitiesCache );
+#endif
+
   sInitialised = true;
   QgsMessageLog::logMessage( QStringLiteral( "Server initialized" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
   return true;
@@ -629,9 +634,7 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
 void QgsServer::initPython()
 {
-  /*
-  sServerInterface = new QgsServerInterfaceImpl( sCapabilitiesCache );
-    // Init plugins
+  // Init plugins
   if ( ! QgsServerPlugins::initPlugins( sServerInterface ) )
   {
     QgsMessageLog::logMessage( QStringLiteral( "No server python plugins are available" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
@@ -640,7 +643,6 @@ void QgsServer::initPython()
   {
     QgsMessageLog::logMessage( QStringLiteral( "Server python plugins loaded" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
   }
-  */
 }
 #endif