Skip to content

Commit

Permalink
Merge pull request #295 from JoomJunk/development
Browse files Browse the repository at this point in the history
Update to v8.1.15
  • Loading branch information
C-Lodder authored Nov 24, 2018
2 parents 9ebceba + 2bba911 commit 6094cf2
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
3 changes: 3 additions & 0 deletions changelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
- -> Removed
! -> Note

Version 8.1.15
# Fix permission issues with page builder extensions

Version 8.1.14
# Fixed install SQL missing a field
# Fixed HTML5 notification image on multilingual sites
Expand Down
18 changes: 14 additions & 4 deletions mod_shoutbox/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class ModShoutboxHelper
*/
public function __construct($id)
{
$this->params = $this->getParams($id);
$this->db = JFactory::getDbo();
$this->params = $this->getParams($id);
}

/**
Expand Down Expand Up @@ -155,10 +155,20 @@ public static function getPostsAjax()
*/
public function getParams($title = null)
{
jimport('joomla.application.module.helper');
$module = JModuleHelper::getModule('mod_shoutbox', $title);
$query = $this->db->getQuery(true)
->select('params')
->from($this->db->qn('#__modules'))
->where($this->db->qn('module') . ' = ' . $this->db->q('mod_shoutbox'));

$this->db->setQuery($query);
$result = $this->db->loadResult();

$moduleParams = new JRegistry;
$moduleParams->loadString($module->params);

if ($result !== '')
{
$moduleParams->loadString($result);
}

return $moduleParams;
}
Expand Down
2 changes: 1 addition & 1 deletion mod_shoutbox/mod_shoutbox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
<authorEmail>[email protected]</authorEmail>
<authorUrl>http://www.joomjunk.co.uk</authorUrl>
<version>8.1.14</version>
<version>8.1.15</version>
<description>JJSHOUTBOX_DESCRIPTION</description>

<install>
Expand Down
1 change: 1 addition & 0 deletions mod_shoutbox/sql/mysql/updates/8.1.15.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Placeholder file for database changes for version 8.1.15
1 change: 1 addition & 0 deletions mod_shoutbox/sql/postgresql/updates/8.1.15.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Placeholder file for database changes for version 8.1.15

0 comments on commit 6094cf2

Please sign in to comment.