Skip to content

Commit c6ffdf1

Browse files
authored
Merge pull request #296 from JoomJunk/development
Merge development into master
2 parents 6094cf2 + 20738a3 commit c6ffdf1

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed

changelog.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
- -> Removed
1515
! -> Note
1616

17+
Version 8.1.17
18+
# Fix critical bug with previous release
19+
20+
Version 8.1.16
21+
# Fix bug getting module parameters
22+
1723
Version 8.1.15
1824
# Fix permission issues with page builder extensions
1925

mod_shoutbox/helper.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,22 @@ public static function getPostsAjax()
156156
public function getParams($title = null)
157157
{
158158
$query = $this->db->getQuery(true)
159-
->select('params')
160-
->from($this->db->qn('#__modules'))
161-
->where($this->db->qn('module') . ' = ' . $this->db->q('mod_shoutbox'));
159+
->select('m.id, m.module, m.params')
160+
->from('#__modules AS m')
161+
->join('LEFT', '#__modules_menu AS mm ON mm.moduleid = m.id')
162+
->where('m.published = 1')
163+
->where('m.module = ' . $this->db->q('mod_shoutbox'))
164+
->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
165+
->where('e.enabled = 1');
162166

163167
$this->db->setQuery($query);
164-
$result = $this->db->loadResult();
168+
$result = $this->db->loadObject();
165169

166170
$moduleParams = new JRegistry;
167-
171+
168172
if ($result !== '')
169173
{
170-
$moduleParams->loadString($result);
174+
$moduleParams->loadString($result->params);
171175
}
172176

173177
return $moduleParams;

mod_shoutbox/mod_shoutbox.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
88
<authorEmail>admin@joomjunk.co.uk</authorEmail>
99
<authorUrl>http://www.joomjunk.co.uk</authorUrl>
10-
<version>8.1.15</version>
10+
<version>8.1.17</version>
1111
<description>JJSHOUTBOX_DESCRIPTION</description>
1212

1313
<install>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 8.1.16
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 8.1.17
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 8.1.16
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 8.1.17

0 commit comments

Comments
 (0)