Merge branch 'master' into feature-28632/Navigation_widget_component_calls_DB_with_fhcomplete

application/libraries/ExtensionsLib.php

@@ -19,6 +19,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \stdClass as stdClass;
+use \PharData as PharData;
 
 /**
  * Library to manage core extensions
@@ -220,7 +221,10 @@ class ExtensionsLib
 	 */
 	public function getInstalledExtensions()
 	{
-		return $this->_ci->ExtensionsModel->getInstalledExtensions();
+		// Loading models
+		$this->_ci->load->model('system/ExtensionsNOPriv_model', 'ExtensionsNOPrivModel');
+
+		return $this->_ci->ExtensionsNOPrivModel->getInstalledExtensions();
 	}
 
 	/**
@@ -454,7 +458,7 @@ class ExtensionsLib
 					require_once('version.php'); // get the core version
 
 					// Checks if the required core version of the extension is the same of this system
-					if (isset($extensionJson->core_version) && version_compare($extensionJson->core_version, $fhcomplete_version,'<='))
+					if (isset($extensionJson->core_version) && version_compare($extensionJson->core_version, $fhcomplete_version, '<='))
 					{
 						$this->_printMessage('Required core version: '.$extensionJson->core_version);
 						$this->_printMessage('Current core version: '.$fhcomplete_version);

application/models/system/ExtensionsNOPriv_model.php

@@ -0,0 +1,31 @@
+<?php
+
+class ExtensionsNOPriv_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->dbTable = 'system.tbl_extensions';
+		$this->pk = 'extension_id';
+		parent::__construct();
+	}
+
+	/**
+	 *
+	 */
+	public function getInstalledExtensions()
+	{
+		$query = 'SELECT extension_id, e1.name, e1.version, description, license, url, core_version, dependencies, enabled
+					FROM system.tbl_extensions e1
+			  INNER JOIN (
+				  SELECT name, MAX(version) AS version
+				  	FROM system.tbl_extensions
+				GROUP BY name) e2
+					  ON (e1.name = e2.name AND e1.version = e2.version)';
+
+		return $this->execQuery($query);
+	}
+}
+