Merge pull request #296 from JoomJunk/development

Merge development into master
JoomJunk · Jan 13, 2019 · c6ffdf1 · c6ffdf1
2 parents 6094cf2 + 20738a3
commit c6ffdf1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/changelog.php b/changelog.php
@@ -14,6 +14,12 @@
 - -> Removed
 ! -> Note
 
+Version 8.1.17
+# Fix critical bug with previous release
+
+Version 8.1.16
+# Fix bug getting module parameters
+
 Version 8.1.15
 # Fix permission issues with page builder extensions
 

diff --git a/mod_shoutbox/helper.php b/mod_shoutbox/helper.php
@@ -156,18 +156,22 @@ public static function getPostsAjax()
 	public function getParams($title = null)
 	{
 		$query = $this->db->getQuery(true)
-		->select('params')
-		->from($this->db->qn('#__modules'))
-		->where($this->db->qn('module') . ' = ' . $this->db->q('mod_shoutbox'));
+			->select('m.id, m.module, m.params')
+			->from('#__modules AS m')
+			->join('LEFT', '#__modules_menu AS mm ON mm.moduleid = m.id')
+			->where('m.published = 1')
+			->where('m.module = ' . $this->db->q('mod_shoutbox'))
+			->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
+			->where('e.enabled = 1');
 
 		$this->db->setQuery($query);
-		$result = $this->db->loadResult();
+		$result = $this->db->loadObject();
 
 		$moduleParams = new JRegistry;
-
+		
 		if ($result !== '')
 		{
-			$moduleParams->loadString($result);
+			$moduleParams->loadString($result->params);
 		}
 
 		return $moduleParams;

diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
 	<authorEmail>admin@joomjunk.co.uk</authorEmail>
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl>
-	<version>8.1.15</version>
+	<version>8.1.17</version>
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>

diff --git a/mod_shoutbox/sql/mysql/updates/8.1.16.sql b/mod_shoutbox/sql/mysql/updates/8.1.16.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.16
diff --git a/mod_shoutbox/sql/mysql/updates/8.1.17.sql b/mod_shoutbox/sql/mysql/updates/8.1.17.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.17
diff --git a/mod_shoutbox/sql/postgresql/updates/8.1.16.sql b/mod_shoutbox/sql/postgresql/updates/8.1.16.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.16
diff --git a/mod_shoutbox/sql/postgresql/updates/8.1.17.sql b/mod_shoutbox/sql/postgresql/updates/8.1.17.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.17