Skip to content

Commit 0ea2386

Browse files
author
Marius
committed
ExpandableFAQ release 6.1.9
ExpandableFAQ release: * Fixed compatibility style routing bug * Refactored time(UTC) * HTTP changed to HTTPS * Refactored CSSFile to CSS_File
1 parent 0e3be02 commit 0ea2386

File tree

12 files changed

+72
-64
lines changed

12 files changed

+72
-64
lines changed

Controllers/Front/AssetController.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public function enqueueMandatoryStyles()
6060
$objStyle->setSitewideStyles();
6161
// Set compatibility styles
6262
$objStyle->setCompatibilityStyles();
63-
$parentThemeCompatibilityCSSFileURL = $objStyle->getParentThemeCompatibilityCSSURL();
64-
$currentThemeCompatibilityCSSFileURL = $objStyle->getCurrentThemeCompatibilityCSSURL();
65-
$sitewideCSSFileURL = $objStyle->getSitewideCSSURL();
63+
$parentThemeCompatibilityCSS_FileURL = $objStyle->getParentThemeCompatibilityCSS_URL();
64+
$currentThemeCompatibilityCSS_FileURL = $objStyle->getCurrentThemeCompatibilityCSS_URL();
65+
$sitewideCSS_FileURL = $objStyle->getSitewideCSS_URL();
6666

6767
if($this->lang->isRTL())
6868
{
@@ -73,19 +73,19 @@ public function enqueueMandatoryStyles()
7373
}
7474

7575
// Register compatibility styles for further use
76-
if($parentThemeCompatibilityCSSFileURL != '')
76+
if($parentThemeCompatibilityCSS_FileURL != '')
7777
{
78-
wp_register_style($this->conf->getPluginURL_Prefix().'parent-theme-front-compatibility', $parentThemeCompatibilityCSSFileURL);
78+
wp_register_style($this->conf->getPluginURL_Prefix().'parent-theme-front-compatibility', $parentThemeCompatibilityCSS_FileURL);
7979
}
80-
if($currentThemeCompatibilityCSSFileURL != '')
80+
if($currentThemeCompatibilityCSS_FileURL != '')
8181
{
82-
wp_register_style($this->conf->getPluginURL_Prefix().'current-theme-front-compatibility', $currentThemeCompatibilityCSSFileURL);
82+
wp_register_style($this->conf->getPluginURL_Prefix().'current-theme-front-compatibility', $currentThemeCompatibilityCSS_FileURL);
8383
}
8484

8585
// Register plugin sitewide style for further use
86-
if($sitewideCSSFileURL != '')
86+
if($sitewideCSS_FileURL != '')
8787
{
88-
wp_register_style($this->conf->getPluginURL_Prefix().'front-sitewide', $sitewideCSSFileURL);
88+
wp_register_style($this->conf->getPluginURL_Prefix().'front-sitewide', $sitewideCSS_FileURL);
8989
}
9090

9191
// As these styles are mandatory, enqueue them here
@@ -129,10 +129,10 @@ public function registerStyles()
129129
}
130130

131131
// Register plugin local style for further use
132-
$localCSSFileURL = $objStyle->getLocalCSSURL();
133-
if($localCSSFileURL != '')
132+
$localCSS_FileURL = $objStyle->getLocalCSS_URL();
133+
if($localCSS_FileURL != '')
134134
{
135-
wp_register_style($this->conf->getPluginHandlePrefix().'main', $localCSSFileURL);
135+
wp_register_style($this->conf->getPluginHandlePrefix().'main', $localCSS_FileURL);
136136
}
137137
}
138138
}

ExpandableFAQ.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Expandable FAQ
44
* Plugin URI: https://wordpress.org/plugins/expandable-faq/
55
* Description: It’s a high quality, native and responsive WordPress plugin to create and view F.A.Q.'s
6-
* Version: 6.1.8
6+
* Version: 6.1.9
77
* Author: KestutisIT
88
* Author URI: https://profiles.wordpress.org/KestutisIT
99
* Text Domain: expandable-faq
@@ -43,7 +43,7 @@ final class ExpandableFAQ
4343
const REQUIRED_PHP_VERSION = '5.6.0';
4444
const REQUIRED_WP_VERSION = 4.6;
4545
const OLDEST_COMPATIBLE_PLUGIN_SEMVER = '6.0.0';
46-
const PLUGIN_SEMVER = '6.1.8';
46+
const PLUGIN_SEMVER = '6.1.9';
4747

4848
// Settings
4949
/**

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

Models/Configuration/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function __construct(
221221
// esc_url replaces ' and & chars with ' and & - but because we know that exact path,
222222
// we know it does not contains them, so we don't need to have two versions esc_url and esc_url_raw
223223
// Demo examples (__FILE__ = $this->pluginFolderAndFile):
224-
// 1. plugin_dir_url(__FILE__) => http://nativerental.com/wp-content/plugins/ExpandableFAQ/
224+
// 1. plugin_dir_url(__FILE__) => https://nativerental.com/wp-content/plugins/ExpandableFAQ/
225225
$this->pluginURL = esc_url(plugin_dir_url($this->pluginPathWithFilename));
226226

227227

Models/Routing/UI_Routing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ public function getFrontLocalDevCSS_URL($paramRelativeURL_AndFile = '', $paramRe
387387

388388
public function getFrontSitewideCSS_URL($paramRelativeURL_AndFile = '', $paramReturnWithFileName = TRUE)
389389
{
390-
$folderURL = $this->getURL('Assets/Front/CSS/Compatibility/'.$paramRelativeURL_AndFile, FALSE).'Assets/Front/CSS/Compatibility/';
390+
$folderURL = $this->getURL('Assets/Front/CSS/Sitewide/'.$paramRelativeURL_AndFile, FALSE).'Assets/Front/CSS/Sitewide/';
391391

392392
return $folderURL.($paramReturnWithFileName === TRUE ? $paramRelativeURL_AndFile : '');
393393
}

Models/Style/Style.php

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class Style implements StyleInterface
1616
{
1717
private $conf = NULL;
1818
private $lang = NULL;
19-
private $debugMode = 0;
19+
private $debugMode = 0; // 0 - disabled, 1 - regular debug, 2+ - deep debug
2020
private $styleName = "";
2121
private $sitewideStyles = array();
2222
private $compatibilityStyles = array();
@@ -52,10 +52,12 @@ public function setSitewideStyles()
5252

5353
if($this->debugMode >= 2)
5454
{
55-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
56-
echo "<br />COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
57-
echo "<br /><br />GLOBAL STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
58-
55+
echo "<br /><br />---------------------------------------------------------------------------------";
56+
echo "<br /><strong>[setSitewideStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
57+
echo "<br /><strong>[setSitewideStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
58+
echo "<br /><strong>[setSitewideStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
59+
echo "<br /><br /><strong>[setSitewideStyles()]</strong> SITEWIDE STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
60+
echo "<br />---------------------------------------------------------------------------------";
5961
}
6062
}
6163

@@ -79,10 +81,12 @@ public function setCompatibilityStyles()
7981

8082
if($this->debugMode >= 2)
8183
{
82-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
83-
echo "<br />COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
84-
echo "<br /><br />GLOBAL STYLES: ".nl2br(print_r($this->sitewideStyles, TRUE));
85-
84+
echo "<br /><br />---------------------------------------------------------------------------------";
85+
echo "<br /><strong>[setCompatibilityStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
86+
echo "<br /><strong>[setCompatibilityStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
87+
echo "<br /><strong>[setCompatibilityStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
88+
echo "<br /><strong>[setCompatibilityStyles()]</strong> COMPATIBILITY STYLES: ".nl2br(print_r($this->compatibilityStyles, TRUE));
89+
echo "<br />---------------------------------------------------------------------------------";
8690
}
8791
}
8892

@@ -107,9 +111,12 @@ public function setLocalStyles()
107111

108112
if($this->debugMode >= 2)
109113
{
110-
echo "<br />CSS FILES:<br />".var_export($cssFiles, TRUE);
111-
echo "<br /><br />SYSTEM STYLES: ".nl2br(print_r($this->localStyles, TRUE));
112-
114+
echo "<br /><br />---------------------------------------------------------------------------------";
115+
echo "<br /><strong>[setLocalStyles()]</strong> \$cssFolderPath: {$cssFolderPath}</strong>";
116+
echo "<br /><strong>[setLocalStyles()]</strong> \$cssFolderURL: {$cssFolderURL}</strong>";
117+
echo "<br /><strong>[setLocalStyles()]</strong> CSS FILES:<br />".var_export($cssFiles, TRUE);
118+
echo "<br /><br /><strong>[setLocalStyles()]</strong> LOCAL STYLES: ".nl2br(print_r($this->localStyles, TRUE));
119+
echo "<br />---------------------------------------------------------------------------------";
113120
}
114121
}
115122

@@ -118,7 +125,7 @@ public function inDebug()
118125
return ($this->debugMode >= 1 ? TRUE : FALSE);
119126
}
120127

121-
public function getParentThemeCompatibilityCSSURL()
128+
public function getParentThemeCompatibilityCSS_URL()
122129
{
123130
// Get parent theme name
124131
$parentThemeName = "";
@@ -148,7 +155,7 @@ public function getParentThemeCompatibilityCSSURL()
148155
return $compatibilityFileURL;
149156
}
150157

151-
public function getCurrentThemeCompatibilityCSSURL()
158+
public function getCurrentThemeCompatibilityCSS_URL()
152159
{
153160
// Get current theme name
154161
$currentThemeName = "";
@@ -177,7 +184,7 @@ public function getCurrentThemeCompatibilityCSSURL()
177184
return $compatibilityFileURL;
178185
}
179186

180-
public function getSitewideCSSURL()
187+
public function getSitewideCSS_URL()
181188
{
182189
// Get the stylesheet file and it's path
183190
$selectedFileURL = '';
@@ -207,7 +214,7 @@ public function getSitewideCSSURL()
207214
return $fileURL;
208215
}
209216

210-
public function getLocalCSSURL()
217+
public function getLocalCSS_URL()
211218
{
212219
// Get the stylesheet file and it's path
213220
$selectedFileURL = '';

Models/Style/StyleInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function setLocalStyles();
2626
public function inDebug();
2727

2828
// Getters
29-
public function getParentThemeCompatibilityCSSURL();
30-
public function getCurrentThemeCompatibilityCSSURL();
31-
public function getSitewideCSSURL();
32-
public function getLocalCSSURL();
29+
public function getParentThemeCompatibilityCSS_URL();
30+
public function getCurrentThemeCompatibilityCSS_URL();
31+
public function getSitewideCSS_URL();
32+
public function getLocalCSS_URL();
3333
}

Models/Update/Patches61Z.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class Patches61Z extends AbstractDatabase implements StackInterface, Datab
1717
{
1818
const CURRENT_MAJOR = 6; // Positive integer [X]
1919
const CURRENT_MINOR = 1; // Positive integer [Y]
20-
const LATEST_PATCH = 8; // Positive integer [Z]
20+
const LATEST_PATCH = 9; // Positive integer [Z]
2121
const LATEST_RELEASE = ''; // String
2222
const LATEST_BUILD_METADATA = ''; // String
2323
const PLUGIN_PREFIX = "expandable_faq_";

Models/Validation/StaticValidator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ public static function getUTC_ISO_DateByTimestamp($paramTimestamp)
675675
return $utcISO_Date;
676676
}
677677

678-
public static function getUTCTimestampFromLocalISODateTime($paramDate, $paramTime)
678+
public static function getUTC_TimestampFromLocalISO_DateTime($paramDate, $paramTime)
679679
{
680680
$UTCTimestamp = 0;
681681
$validISODate = static::getValidISO_Date($paramDate, 'Y-m-d');
@@ -695,9 +695,9 @@ public static function getUTCTimestampFromLocalISODateTime($paramDate, $paramTim
695695
/*
696696
* Appears that this function is useless in the NS and nowhere used
697697
* While my brains still think that I want to add timezone offset, appears that correct way is to subtract it
698-
* via getUTCTimestampFromLocalISODateTime($paramDate, $paramTime)
698+
* via getUTC_TimestampFromLocalISO_DateTime($paramDate, $paramTime)
699699
*/
700-
public static function getLocalTimestampFromUTC_ISODateTime($paramDate, $paramTime)
700+
public static function getLocalTimestampFromUTC_ISO_DateTime($paramDate, $paramTime)
701701
{
702702
$localTimestamp = 0;
703703
$validISODate = static::getValidISO_Date($paramDate, 'Y-m-d');

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ to your website's FAQ page and make automatically expand specific FAQ with a pag
107107

108108

109109
# Changelog
110+
= 6.1.9 =
111+
* Fixed compatibility style routing bug
112+
* Refactored time(UTC)
113+
* HTTP changed to HTTPS
114+
* Refactored CSSFile to CSS_File
110115

111116
= 6.1.8 =
112117
* Minor HTML improvements.

0 commit comments

Comments
 (0)