From d60dcb969d353351d6e8755ca92e8afaecef01ca Mon Sep 17 00:00:00 2001 From: "WebMan Design, Oliver Juhas" Date: Wed, 15 May 2019 21:34:37 +0200 Subject: [PATCH] 2.4.1 --- assets/images/svg/social-icons.svg | 8 +++++++ changelog.md | 25 +++++++++++++++++++++ header.php | 8 ++++++- includes/frontend/class-header.php | 10 ++------- includes/frontend/class-menu.php | 8 ++++--- includes/welcome/welcome.php | 5 +++-- readme.txt | 8 +++---- style.css | 2 +- template-parts/admin/notice-welcome.php | 9 +++++++- template-parts/admin/welcome-demo.php | 9 +++++++- template-parts/admin/welcome-footer.php | 9 +++++++- template-parts/admin/welcome-header.php | 9 +++++++- template-parts/admin/welcome-promo.php | 9 +++++++- template-parts/admin/welcome-quickstart.php | 17 +++++++++----- template-parts/admin/welcome-wordpress.php | 9 +++++++- 15 files changed, 115 insertions(+), 30 deletions(-) diff --git a/assets/images/svg/social-icons.svg b/assets/images/svg/social-icons.svg index 920f990..89ed48a 100644 --- a/assets/images/svg/social-icons.svg +++ b/assets/images/svg/social-icons.svg @@ -67,6 +67,10 @@ + + + + @@ -172,6 +176,10 @@ + + + + diff --git a/changelog.md b/changelog.md index e934219..8ed9b17 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,30 @@ # Modern Changelog +## 2.4.1 + +* **Add**: Adding WhatsApp and Google social icon +* **Update**: Implementing WordPress 5.2 code updates +* **Fix**: Preventing PHP error after theme activation + +### Files changed: + + changelog.md + header.php + readme.txt + style.css + assets/images/svg/social-icons.svg + includes/frontend/class-header.php + includes/frontend/class-menu.php + includes/welcome/welcome.php + template-parts/admin/notice-welcome.php + template-parts/admin/welcome-demo.php + template-parts/admin/welcome-footer.php + template-parts/admin/welcome-header.php + template-parts/admin/welcome-promo.php + template-parts/admin/welcome-quickstart.php + template-parts/admin/welcome-wordpress.php + + ## 2.4.0 * **Update**: Navigation accessibility and touch screen functionality diff --git a/header.php b/header.php index 2158a97..8789727 100644 --- a/header.php +++ b/header.php @@ -9,7 +9,7 @@ * @copyright WebMan Design, Oliver Juhas * * @since 1.0.0 - * @version 2.4.0 + * @version 2.4.1 */ @@ -40,6 +40,12 @@ 'facebook', 'flickr.com' => 'flickr', 'foursquare.com' => 'foursquare', - 'plus.google.com' => 'google-plus', + 'plus.google.' => 'google-plus', + 'google.' => 'google', 'github.com' => 'github', 'instagram.com' => 'instagram', 'linkedin.com' => 'linkedin', @@ -465,6 +466,7 @@ public static function social_links_icons() { 'vimeo.com' => 'vimeo', 'vine.co' => 'vine', 'vk.com' => 'vk', + 'wa.me' => 'whatsapp', 'wordpress.org' => 'wordpress', 'wordpress.com' => 'wordpress', 'xing.com' => 'xing', diff --git a/includes/welcome/welcome.php b/includes/welcome/welcome.php index ec96759..76cbffe 100644 --- a/includes/welcome/welcome.php +++ b/includes/welcome/welcome.php @@ -6,7 +6,7 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.2.0 + * @version 2.4.1 * * Contents: * @@ -24,7 +24,8 @@ if ( ! is_admin() - || ! Modern_Library_Customize::get_theme_mod( 'admin_welcome_page' ) + // Modern_Library_Customize::get_theme_mod() does not work here yet. + || ! get_theme_mod( 'admin_welcome_page', true ) ) { return; } diff --git a/readme.txt b/readme.txt index fccb820..6ce36b5 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: webmandesign Tags: one-column, two-columns, right-sidebar, grid-layout, flexible-header, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-image-header, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, portfolio Requires at least: 4.7.0 -Tested up to: 5.1.1 -Stable tag: 2.4.0 +Tested up to: 5.2 +Stable tag: 2.4.1 License: GNU General Public License v3 License URI: https://www.gnu.org/licenses/gpl-3.0.html @@ -37,8 +37,8 @@ Please see `changelog.md` file. == Upgrade Notice == -= 2.4.0 = -Improving accessibility, updating info, improving excerpt display, improving CSS variables functionality, fixing Gallery post format slideshow issue with new WordPress block editor. += 2.4.1 = +Implementing WordPress 5.2 code updates, adding WhatsApp and Google social icon, preventing PHP error after theme activation. == Resources == diff --git a/style.css b/style.css index 61889ef..4e9c970 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Theme Name: Modern Theme URI: https://www.webmandesign.eu/portfolio/modern-wordpress-theme/ Author: WebMan Design Author URI: https://www.webmandesign.eu/ -Version: 2.4.0 +Version: 2.4.1 Text Domain: modern Domain Path: /languages License: GNU General Public License v3 diff --git a/template-parts/admin/notice-welcome.php b/template-parts/admin/notice-welcome.php index 0ed936b..7d7c9db 100644 --- a/template-parts/admin/notice-welcome.php +++ b/template-parts/admin/notice-welcome.php @@ -6,13 +6,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.4.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + // Helper variables $theme_name = wp_get_theme( 'modern' )->get( 'Name' ); diff --git a/template-parts/admin/welcome-demo.php b/template-parts/admin/welcome-demo.php index f5cef09..fa1384a 100644 --- a/template-parts/admin/welcome-demo.php +++ b/template-parts/admin/welcome-demo.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.0.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + ?>
diff --git a/template-parts/admin/welcome-footer.php b/template-parts/admin/welcome-footer.php index 058bd37..a3a28ca 100644 --- a/template-parts/admin/welcome-footer.php +++ b/template-parts/admin/welcome-footer.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.4.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + ?>
diff --git a/template-parts/admin/welcome-header.php b/template-parts/admin/welcome-header.php index 753d6a7..ed76cef 100644 --- a/template-parts/admin/welcome-header.php +++ b/template-parts/admin/welcome-header.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.4.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + ?>
diff --git a/template-parts/admin/welcome-promo.php b/template-parts/admin/welcome-promo.php index 4c66456..3a66260 100644 --- a/template-parts/admin/welcome-promo.php +++ b/template-parts/admin/welcome-promo.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.4.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + ?>
diff --git a/template-parts/admin/welcome-quickstart.php b/template-parts/admin/welcome-quickstart.php index d86523a..2995c41 100644 --- a/template-parts/admin/welcome-quickstart.php +++ b/template-parts/admin/welcome-quickstart.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.3.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + // Helper variables $step = 0; @@ -24,9 +31,9 @@

-
+
-
+
@@ -46,7 +53,7 @@
-
+
@@ -72,7 +79,7 @@
-
+
diff --git a/template-parts/admin/welcome-wordpress.php b/template-parts/admin/welcome-wordpress.php index 5c3f1c7..6a17913 100644 --- a/template-parts/admin/welcome-wordpress.php +++ b/template-parts/admin/welcome-wordpress.php @@ -8,13 +8,20 @@ * @copyright WebMan Design, Oliver Juhas * * @since 2.0.0 - * @version 2.0.0 + * @version 2.4.1 */ +// Requirements check + + if ( ! class_exists( 'Modern_Welcome' ) ) { + return; + } + + ?>