Fixed bug in requiring Joomla pagination

cmextension · Feb 11, 2018 · 26ea9db · 26ea9db
1 parent 1362b0b
commit 26ea9db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/com_cmdonation/admin/helpers/cmpagination.php b/packages/com_cmdonation/admin/helpers/cmpagination.php
@@ -7,14 +7,18 @@
 
 defined('_JEXEC') or die;
 
-if (version_compare(JVERSION, '3.0.0', 'lt'))
+if (version_compare(JVERSION, '3.8.0', 'ge'))
 {
-	require_once JPATH_LIBRARIES . '/joomla/html/pagination.php';
+	require_once JPATH_LIBRARIES . '/src/Pagination/Pagination.php';
 }
-else
+elseif (version_compare(JVERSION, '3.8.0', 'lt') && version_compare(JVERSION, '3.0.0', 'ge'))
 {
 	require_once JPATH_LIBRARIES . '/cms/pagination/pagination.php';
 }
+else
+{
+	require_once JPATH_LIBRARIES . '/joomla/html/pagination.php';
+}
 
 /**
  * Override JPagination for PureCSS style.

diff --git a/packages/com_cmdonation/admin/views/dashboard/tmpl/default.php b/packages/com_cmdonation/admin/views/dashboard/tmpl/default.php
@@ -96,8 +96,8 @@
 					<h4>Extension information</h4>
 					<ul>
 						<li>Extension: CM Donation</li>
-						<li>Version: 1.1.1</li>
-						<li>Released date: January 12, 2016</li>
+						<li>Version: 1.1.2</li>
+						<li>Released date: February 11, 2018</li>
 						<li>License: <a href="http://www.gnu.org/licenses/gpl-2.0.html" target="_blank">GNU General Public License version 2 or later</a></li>
 						<li>Author: <a href="http://www.cmext.vn/" target="_blank">CMExtension team</a></li>
 					</ul>

diff --git a/packages/com_cmdonation/cmdonation.xml b/packages/com_cmdonation/cmdonation.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="2.5" method="upgrade">
 	<name>com_cmdonation</name>
-	<version>1.1.1</version>
-	<creationDate>January 12, 2016</creationDate>
-	<copyright>(C) 2014-2016 CMExtension Team</copyright>
+	<version>1.1.2</version>
+	<creationDate>February 11, 2018</creationDate>
+	<copyright>(C) 2014-2018 CMExtension Team</copyright>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>

diff --git a/pkg_cmdonation.xml b/pkg_cmdonation.xml
@@ -2,12 +2,12 @@
 <extension type="package" version="2.5" method="upgrade">
 	<name>CM Donation package</name>
 	<description>The package for CM Donation component. Including the component and the required plug-ins.</description>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>
-	<creationDate>January 12, 2016</creationDate>
-	<copyright>(C) 2014-2016 CMExtension team</copyright>
+	<creationDate>February 11, 2018</creationDate>
+	<copyright>(C) 2014-2018 CMExtension team</copyright>
 	<license>GNU General Public License version 2 or later</license>
 	<packagename>cmdonation</packagename>
 	<url>http://www.cmext.vn/</url>