Merge pull request #1 from codexilab/develop

Little bugs about URLs fixed
codexilab · Oct 5, 2021 · d0917be · d0917be
2 parents 10f8827 + 56e10e1
commit d0917be
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/xtclass/CHANGELOG.md b/xtclass/CHANGELOG.md
@@ -1,7 +1,11 @@
 # XTClass
 ====================
 
-## [1.0.1] 2021-10-03
+## [1.0.2] 2021-10-04
+
+### Fixed
+
+- Little bugs about URLs.
 
 ### Changed
 

diff --git a/xtclass/functions.php b/xtclass/functions.php
@@ -23,7 +23,7 @@
     require_once dirname(__FILE__) . '/includes/classes/scssphp/scss.inc.php';
     use ScssPhp\ScssPhp\Compiler;
 
-define('XTCLASS_THEME_VERSION', '1.0.1');
+define('XTCLASS_THEME_VERSION', '1.0.2');
 define('XTCLASS_THEME_FOLDER', 'xtclass');
 define('XTCLASS_THEME_PATH', osc_themes_path() . XTCLASS_THEME_FOLDER . '/');
 

diff --git a/xtclass/index.php b/xtclass/index.php
@@ -26,7 +26,7 @@
 /*
 Theme Name: XTClass
 Theme URI: https://gitlab.com/codexilab/osclass-xtclass
-Description: Bootstrap 4 theme based in Bender Bootstrap 1.0.3
+Description: Bootstrap 4 theme based in BenderBS 1.1.7
 Version: 1.0.2
 Author: CodexiLab
 Author URI: https://gitlab.com/codexilab
@@ -37,8 +37,8 @@
     function xtclass_theme_info() {
         return [
              'name'        => 'XTClass'
-            ,'version'     => '1.0.1'
-            ,'description' => 'Bootstrap 4 theme based in Bender Bootstrap 1.0.3'
+            ,'version'     => '1.0.2'
+            ,'description' => 'Bootstrap 4 theme based in BenderBS 1.1.7'
             ,'author_name' => 'CodexiLab'
             ,'author_url'  => 'https://github.com/codexilab'
             ,'locations'   => array()

diff --git a/xtclass/user-items.php b/xtclass/user-items.php
@@ -35,6 +35,8 @@
 	$listClass 	= 'col-sm-4';
 }
 
+$rw = (osc_rewrite_enabled()) ? '?' : '&';
+
 osc_current_web_theme_path('header.php'); ?>
 
 	<?php osc_current_web_theme_path('user-sidebar.php'); ?>
@@ -56,11 +58,11 @@
 		<div class="row mb-3">
 			<div class="col-md-12 text-right">
 				<div class="btn-group btn-group-toggle">
-					<a href="<?php echo osc_user_list_items_url(); ?>&sShowAs=list" class="btn btn-custom-1 btn-sm <?php echo $list; ?>"
+					<a href="<?php echo osc_user_list_items_url() . $rw; ?>sShowAs=list" class="btn btn-custom-1 btn-sm <?php echo $list; ?>"
 						data-toggle="tooltip" data-placement="top" title="<?php _e('List', XTCLASS_THEME_FOLDER); ?>">
 						<i class="fas fa-list-ul"></i>
 					</a>
-					<a href="<?php echo osc_user_list_items_url(); ?>&sShowAs=gallery" class="btn btn-custom-1 btn-sm <?php echo $gallery; ?>"
+					<a href="<?php echo osc_user_list_items_url() . $rw; ?>sShowAs=gallery" class="btn btn-custom-1 btn-sm <?php echo $gallery; ?>"
 						data-toggle="tooltip" data-placement="top" title="<?php _e('Grid', XTCLASS_THEME_FOLDER); ?>">
 						<i class="fas fa-th"></i>
 					</a>