Merge pull request #744 from Joomla-Bible-Study/development

v9.0.16

README.md

@@ -14,15 +14,15 @@ Status
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
         <td align="center">Development</td>
-        <td align="center">9.0.16</td>
+        <td align="center">9.0.17</td>
         <td align="center">TBD</td>
         <td align="center">3.4+</td>
     </tr>
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
         <td align="center">Master</td>
-        <td align="center">9.0.15</td>
-        <td align="center">March 9, 2017</td>
+        <td align="center">9.0.16</td>
+        <td align="center">May 11, 2017</td>
         <td align="center">3.4+</td>
     </tr>
 </table>

build/pkg_biblestudy_package.xml

@@ -8,8 +8,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<packager>Tom Fuller</packager>
 	<packagerurl>https://www.joomlabiblestudy.org</packagerurl>

com_biblestudy/admin/api.php

@@ -19,7 +19,7 @@
 define('JBSM_PROFILER', 0);
 
 // Version information
-define('BIBLESTUDY_VERSION', '9.0.15');
+define('BIBLESTUDY_VERSION', '9.0.16');
 define('BIBLESTUDY_VERSION_UPDATEFILE', 'JBS Version ' . BIBLESTUDY_VERSION);
 
 // Default values

com_biblestudy/admin/install/sql/install.sql

@@ -11,7 +11,7 @@ CREATE TABLE `#__bsms_update` (
 
 INSERT INTO `#__bsms_update` (`id`, `version`)
 VALUES
-  (1, '9.0.15');
+  (1, '9.0.16');
 
 -- --------------------------------------------------------
 

com_biblestudy/admin/install/sql/updates/mysql/9.0.10.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('23', '9.0.10')
-ON DUPLICATE KEY UPDATE version = '9.0.10';
+ON DUPLICATE KEY UPDATE version = '9.0.10';

com_biblestudy/admin/install/sql/updates/mysql/9.0.11.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('24', '9.0.11')
-ON DUPLICATE KEY UPDATE version = '9.0.11';
+ON DUPLICATE KEY UPDATE version = '9.0.11';

com_biblestudy/admin/install/sql/updates/mysql/9.0.12.sql

@@ -8,4 +8,4 @@ INSERT INTO `#__bsms_update` (id, version) VALUES ('25', '9.0.12')
 ON DUPLICATE KEY UPDATE version = '9.0.12';
 
 
-ALTER TABLE `#__bsms_series` ADD COLUMN `pc_show` INT(3) NOT NULL DEFAULT '1' COMMENT 'For displaying on podcasts page' AFTER `landing_show`;
+ALTER TABLE `#__bsms_series` ADD COLUMN `pc_show` INT(3) NOT NULL DEFAULT '1' COMMENT 'For displaying on podcasts page' AFTER `landing_show`;

com_biblestudy/admin/install/sql/updates/mysql/9.0.13.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('26', '9.0.13')
-ON DUPLICATE KEY UPDATE version = '9.0.13';
+ON DUPLICATE KEY UPDATE version = '9.0.13';

com_biblestudy/admin/install/sql/updates/mysql/9.0.14.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('27', '9.0.14')
-ON DUPLICATE KEY UPDATE version = '9.0.14';
+ON DUPLICATE KEY UPDATE version = '9.0.14';

com_biblestudy/admin/install/sql/updates/mysql/9.0.15.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('28', '9.0.15')
-ON DUPLICATE KEY UPDATE version = '9.0.15';
+ON DUPLICATE KEY UPDATE version = '9.0.15';

com_biblestudy/admin/install/sql/updates/mysql/9.0.16.sql

@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS `#__bsms_update` (
+  id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  version VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (id)
+) DEFAULT CHARSET=utf8;
+
+INSERT INTO `#__bsms_update` (id, version) VALUES ('29', '9.0.16')
+ON DUPLICATE KEY UPDATE version = '9.0.16';

com_biblestudy/admin/install/sql/updates/mysql/9.0.2.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('20', '9.0.2')
-ON DUPLICATE KEY UPDATE version = '9.0.2';
+ON DUPLICATE KEY UPDATE version = '9.0.2';

com_biblestudy/admin/install/sql/updates/mysql/9.0.8.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('21', '9.0.8')
-ON DUPLICATE KEY UPDATE version = '9.0.8';
+ON DUPLICATE KEY UPDATE version = '9.0.8';

com_biblestudy/admin/install/sql/updates/mysql/9.0.9.sql

@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `#__bsms_update` (
 ) DEFAULT CHARSET=utf8;
 
 INSERT INTO `#__bsms_update` (id, version) VALUES ('22', '9.0.9')
-ON DUPLICATE KEY UPDATE version = '9.0.9';
+ON DUPLICATE KEY UPDATE version = '9.0.9';

com_biblestudy/admin/models/install.php

@@ -167,7 +167,7 @@ public function startScanning()
 			$this->versionStack = array();
 		}
 
-		ksort($this->versionStack);
+		asort($this->versionStack);
 
 		$this->saveStack();
 
@@ -345,13 +345,13 @@ private function getSteps()
 				self::correctVersions();
 				/* Find Last updated Version in Update table */
 				$query = $this->_db->getQuery(true);
-				$query->select('*')
+				$query->select('version')
 					->from('#__bsms_update')
-					->order($this->_db->qn('version') . ' desc');
-				$this->_db->setQuery($query);
+					->order($this->_db->qn('id') . ' DESC');
+				$this->_db->setQuery($query, 0, 1);
 				$updates              = $this->_db->loadObject();
 				$version              = $updates->version;
-				$this->versionSwitch = $version;
+				$this->versionSwitch  = $version;
 
 				$this->callstack['subversiontype_version'] = $version;
 				break;
@@ -794,7 +794,7 @@ private function RealRun()
 
 			while (!empty($this->versionStack) && $this->haveEnoughTime())
 			{
-				$version       = array_shift($this->versionStack);
+				$version       = array_pop($this->versionStack);
 				$this->running = $version;
 				$this->doneSteps++;
 				$run = $this->allUpdate($version);

com_biblestudy/biblestudy.xml

@@ -6,8 +6,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_INS_XML_DESCRIPTION</description>
 

mod_biblestudy/mod_biblestudy.xml

@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_DESCRIPTION</description>
 	<files>

mod_biblestudy_podcast/mod_biblestudy_podcast.xml

@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_MDL_PODCAST_XML_DESCRIPTION</description>
 	<files>

plg_biblestudy_backup/jbsbackup.xml

@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_BACKUP_XML_DESCRIPTION</description>
 

plg_biblestudy_finder/biblestudy.xml

@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_FINDER_XML_DESCRIPTION</description>
 	<files>

plg_biblestudy_podcast/jbspodcast.xml

@@ -5,8 +5,8 @@
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://www.joomlabiblestudy.org</authorUrl>
     <copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-    <version>9.0.15</version>
-    <creationDate>May 9, 2017</creationDate>
+    <version>9.0.16</version>
+    <creationDate>May 11, 2017</creationDate>
     <license>http://www.gnu.org/licenses/gpl.html</license>
     <description>JBS_PLG_PODCAST_XML_DESCRIPTION</description>
 

plg_biblestudy_search/biblestudysearch.xml

@@ -5,8 +5,8 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.joomlabiblestudy.org</authorUrl>
 	<copyright>(C) 2007 - 2017 Joomla Bible Study All rights reserved.</copyright>
-	<version>9.0.15</version>
-	<creationDate>May 9, 2017</creationDate>
+	<version>9.0.16</version>
+	<creationDate>May 11, 2017</creationDate>
 	<license>http://www.gnu.org/licenses/gpl.html</license>
 	<description>JBS_PLG_SEARCH_XML_DESCRIPTION</description>
 	<files>