diff --git a/composer.json b/composer.json index f9dcdbcdd6e3bd3d750ab6e392fb0b77f9c7a224..a6c4cd16f29b57135046fd3be9af8c48770cf47b 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,6 @@ "wpackagist-theme/ocular-professor": "1.3.1", "wpackagist-theme/rusty-grunge": "1.3", "wpackagist-theme/simplex": "2.0.1.3", - "wpackagist-theme/thematic": "1.0.4", "wpackagist-theme/threattocreativity": "3.2", "wpackagist-theme/twentyeleven": "4.3", "wpackagist-theme/twentyfifteen": "3.4", @@ -109,7 +108,7 @@ "wpackagist-plugin/katex": "2.2.3", "noblogs/eu-compliance": "0.1.0", "noblogs/nospam": "0.2.3", - "noblogs/themes-misc": "0.1.16", + "noblogs/themes-misc": "0.1.17", "stuttter/ludicrousdb": "5.0.0", "wpackagist-plugin/creative-commons": "^2021.04", "wpackagist-plugin/disable-remove-google-fonts": "1.5.4", diff --git a/composer.lock b/composer.lock index 09ce1f229d1da88dfdaeb3f842c1654262d2c766..4537c8e52d000863cd9e22de0f0369a7821a98e7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6a571b2c714310e7b06eef9a1585bd85", + "content-hash": "5d6ac451fe25a1f29ce71770c89f908c", "packages": [ { "name": "bjornjohansen/wplang", @@ -684,16 +684,16 @@ }, { "name": "noblogs/themes-misc", - "version": "0.1.16", + "version": "0.1.17", "source": { "type": "git", "url": "https://git.autistici.org/noblogs/themes-misc.git", - "reference": "fe3132eaa09eb22807b2cfcb3e1857ac2abe3bd1" + "reference": "33e9b32291a182483e139e38a2bcfd356d27c830" }, "dist": { "type": "zip", - "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=fe3132eaa09eb22807b2cfcb3e1857ac2abe3bd1", - "reference": "fe3132eaa09eb22807b2cfcb3e1857ac2abe3bd1", + "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=33e9b32291a182483e139e38a2bcfd356d27c830", + "reference": "33e9b32291a182483e139e38a2bcfd356d27c830", "shasum": "" }, "type": "project", @@ -1854,24 +1854,6 @@ "type": "wordpress-theme", "homepage": "https://wordpress.org/themes/simplex/" }, - { - "name": "wpackagist-theme/thematic", - "version": "1.0.4", - "source": { - "type": "svn", - "url": "https://themes.svn.wordpress.org/thematic/", - "reference": "1.0.4" - }, - "dist": { - "type": "zip", - "url": "https://downloads.wordpress.org/theme/thematic.1.0.4.zip" - }, - "require": { - "composer/installers": "^1.0 || ^2.0" - }, - "type": "wordpress-theme", - "homepage": "https://wordpress.org/themes/thematic/" - }, { "name": "wpackagist-theme/threattocreativity", "version": "3.2", diff --git a/composer.patches.json b/composer.patches.json index b0d1009a11a705575001eb68f343ba5516491995..091c12cf43bb7009af282b4811023789507fefb6 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -114,9 +114,6 @@ }, "wpackagist-theme/bliss": { "Footer credits": "patches/themes/0223-bliss-footer.patch" - }, - "wpackagist-theme/thematic": { - "Footer credits": "patches/themes/0223-thematic-footer.patch" } } } diff --git a/patches/themes/0223-thematic-footer.patch b/patches/themes/0223-thematic-footer.patch deleted file mode 100644 index 4c2de3e93a2223756608d61eb589186caeeccff5..0000000000000000000000000000000000000000 --- a/patches/themes/0223-thematic-footer.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/wp-content/themes/thematic/footer.php b/wp-content/themes/thematic/footer.php -index c86c081a..e6ae1ff3 100644 ---- a/wp-content/themes/thematic/footer.php -+++ b/wp-content/themes/thematic/footer.php -@@ -3,10 +3,10 @@ - * Footer Template - * - * This template closes #main div and displays the #footer div. -- * -+ * - * Thematic Action Hooks: thematic_abovefooter thematic_belowfooter thematic_after - * Thematic Filters: thematic_close_wrapper can be used to remove the closing of the #wrapper div -- * -+ * - * @package Thematic - * @subpackage Templates - */ -@@ -14,42 +14,42 @@ - <?php // action hook for placing content above the closing of the #main div - thematic_abovemainclose(); - ?> -- -+ - </div><!-- #main --> -- -+ - <?php - // action hook for placing content above the footer - thematic_abovefooter(); -- -+ - // Filter provided for altering output of the footer opening element - echo ( apply_filters( 'thematic_open_footer', '<div id="footer">' ) ); -- ?> -- -+ ?> -+ - <?php -- // action hook creating the footer -+ // action hook creating the footer - thematic_footer(); - ?> -- -+ - <?php - // Filter provided for altering output of the footer closing element -- echo ( apply_filters( 'thematic_close_footer', '</div><!-- #footer -->' . "\n" ) ); -- -+ echo ( apply_filters( 'thematic_close_footer', '<strong> and <a href="https://www.autistici.org">R*</a></strong></div><!-- #footer -->' . "\n" ) ); -+ - // action hook for placing content below the footer - thematic_belowfooter(); - ?> -- -+ - <?php -- // Filter provided for altering output of wrapping element follows the body tag -- if ( apply_filters( 'thematic_close_wrapper', true ) ) -+ // Filter provided for altering output of wrapping element follows the body tag -+ if ( apply_filters( 'thematic_close_wrapper', true ) ) - echo ( '</div><!-- #wrapper .hfeed -->' . "\n" ); -- -+ - - // action hook for placing content before closing the BODY tag -- thematic_after(); -- -+ thematic_after(); -+ - // calling WordPress' footer action hook - wp_footer(); - ?> - - </body> --</html> -\ No newline at end of file -+</html>