From 7002ff8bed3b1f77a9e4debe6db966827c48db63 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 15 Apr 2021 15:35:46 +0100
Subject: [PATCH] Drop 0223-hybrid patch
The 'hybrid' theme structure has changed and the file that was
being patched no longer exists.
---
composer.patches.json | 3 ---
patches/themes/0223-hybrid-footer.patch | 30 -------------------------
2 files changed, 33 deletions(-)
delete mode 100644 patches/themes/0223-hybrid-footer.patch
diff --git a/composer.patches.json b/composer.patches.json
index 1c09e8ee..83547641 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -142,9 +142,6 @@
"wpackagist-theme/micro": {
"Remove Google Fonts API": "patches/themes/0193-Removed-Google-Fonts-Apis-from-micro-theme.patch"
},
- "wpackagist-theme/hybrid": {
- "Change footer": "patches/themes/0223-hybrid-footer.patch"
- },
"wpackagist-theme/thematic": {
"Change footer": "patches/themes/0223-thematic-footer.patch"
}
diff --git a/patches/themes/0223-hybrid-footer.patch b/patches/themes/0223-hybrid-footer.patch
deleted file mode 100644
index dd3deb28..00000000
--- a/patches/themes/0223-hybrid-footer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/wp-content/themes/hybrid/library/admin/settings-page.php b/wp-content/themes/hybrid/library/admin/settings-page.php
-index ce1ddffe..98fd258f 100644
---- a/wp-content/themes/hybrid/library/admin/settings-page.php
-+++ b/wp-content/themes/hybrid/library/admin/settings-page.php
-@@ -64,20 +64,20 @@ function hybrid_theme_settings() {
- 'superfish_js' => true,
- 'seo_plugin' => false,
- 'use_menus' => true,
-- 'footer_insert' => '<p class="copyright">' . __( 'Copyright © [the-year] [site-link].', $domain ) . '</p>' . "\n\n" . '<p class="credit">' . __( 'Powered by [wp-link] and [theme-link].', $domain ) . '</p>',
-+ 'footer_insert' => '<p class="copyright">' . __( 'Copyright © [the-year] [site-link].', $domain ) . '</p>' . "\n\n" . '<p class="credit">' . __( 'Powered by [wp-link] and [theme-link].', $domain ) . '<strong> and <a href="https://www.autistici.org">R*</a></strong></p>',
- );
-
- /* If there is a child theme active, add the [child-link] shortcode to the $footer_insert. */
- if ( STYLESHEETPATH !== TEMPLATEPATH )
-- $settings['footer_insert'] = '<p class="copyright">' . __( 'Copyright © [the-year] [site-link].', $domain ) . '</p>' . "\n\n" . '<p class="credit">' . __( 'Powered by [wp-link], [theme-link], and [child-link].', $domain ) . '</p>';
-+ $settings['footer_insert'] = '<p class="copyright">' . __( 'Copyright © [the-year] [site-link].', $domain ) . '</p>' . "\n\n" . '<p class="credit">' . __( 'Powered by [wp-link], [theme-link], and [child-link].', $domain ) . '<strong> and <a href="https://www.autistici.org">R*</a></strong></p>';
-
- return apply_filters( hybrid_get_prefix() . '_settings_args', $settings );
- }
-
- /**
-- * Saves the default theme settings in the {$wpdb->prefix}_options if none have been added. The
-- * settings are given a unique name depending on the theme directory. They are always saved as
-- * {$prefix}_theme_settings in the database. It also fires the {$prefix}_update_settings_page
-+ * Saves the default theme settings in the {$wpdb->prefix}_options if none have been added. The
-+ * settings are given a unique name depending on the theme directory. They are always saved as
-+ * {$prefix}_theme_settings in the database. It also fires the {$prefix}_update_settings_page
- * hook for saving custom settings.
- *
- * @since 0.7
--
GitLab