Skip to content

Commit

Permalink
Merge pull request #10 from figuren-theater/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
carstingaxion authored Apr 20, 2023
2 parents 3048065 + 5ae6ed4 commit 7c48383
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 127 deletions.
13 changes: 8 additions & 5 deletions inc/feed-pull/auto-setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@
use function wp_insert_post;
use function wp_slash;

const LINK_PT = Post_Types\Post_Type__ft_link::NAME;
const UTILITY_TAX = Features\UtilityFeaturesManager::TAX;
const UTILITY_TERM = UtilityFeaturesRepo\UtilityFeature__ft_link__feedpull_import::SLUG, //'feedpull-import',;
// const LINK_PT = Post_Types\Post_Type__ft_link::NAME;
const LINK_PT = 'ft_link';
// const UTILITY_TAX = Features\UtilityFeaturesManager::TAX;
const UTILITY_TAX = 'hm-utility';
// const UTILITY_TERM = UtilityFeaturesRepo\UtilityFeature__ft_link__feedpull_import::SLUG; //'feedpull-import',;
const UTILITY_TERM = 'feedpull-import';

function bootstrap_auto_setup() {

Expand Down Expand Up @@ -97,7 +100,7 @@ function create_feed_post( WP_Post $post ) : void {
$insert_args = wp_slash( array(
'post_author' => $post->post_author,
'post_type' => FEED_POSTTYPE,
'post_title' => 'Feed: ' . $post->post_content ),
'post_title' => 'Feed: ' . $post->post_content,
'post_parent' => $post->ID,
'post_status' => 'publish',

Expand Down Expand Up @@ -156,7 +159,7 @@ function add_or_delete_feed_post( int $object_id, array $terms, array $new_terms

// Return early if not a link post.
if ( ! is_a($post, 'WP_Post') || $post->post_type !== LINK_PT ) {
continue;
return;
}

// Add or remove feed posts
Expand Down
2 changes: 1 addition & 1 deletion inc/feed-pull/import.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ function fp_post_args( array $new_post_args, $post, int $source_feed_id ) : arra
unset($new_post_args['post_excerpt']);
}

$new_post_args = wp_parse_args( $import_args, $new_post_args )
$new_post_args = wp_parse_args( $import_args, $new_post_args );

return wp_slash( $new_post_args );
}
Expand Down
7 changes: 4 additions & 3 deletions inc/feed-pull/namespace.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
use function wp_doing_ajax;
use function wp_doing_cron;

use FP_OPTION_NAME;
// use FP_OPTION_NAME;
const FP_OPTION_NAME = 'fp_feed_pull';

const BASENAME = 'feed-pull/feed-pull.php';
const PLUGINPATH = FT_VENDOR_DIR . '/carstingaxion/' . BASENAME;
Expand Down Expand Up @@ -118,7 +119,7 @@ function register_post_type_args( array $args ) : array {
$cuc = current_user_can( 'manage_sites' );

$args['public'] = false; // WHY is this 'true' by default?
$args['supports'] = array( 'title', 'post-formats' )
$args['supports'] = array( 'title', 'post-formats' );

$args['show_ui'] = $cuc;
$args['show_in_menu'] = $cuc;
Expand All @@ -127,7 +128,7 @@ function register_post_type_args( array $args ) : array {
$args['menu_position'] = 100;

$args['taxonomies'] = $args['taxonomies'] ?? [];
$args['taxonomies'][] = Features\UtilityFeaturesManager::TAX,
$args['taxonomies'][] = Features\UtilityFeaturesManager::TAX;

return $args;
}
Expand Down
2 changes: 1 addition & 1 deletion plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Author URI: https://figuren.theater
* Text Domain: figurentheater
* Domain Path: /languages
* Version: 1.0.25
* Version: 1.0.26
*
* @package Figuren_Theater\Data
*/
Expand Down
117 changes: 0 additions & 117 deletions templates/htdocs/vendor/rss-bridge/rss-bridge/config.default.ini.php

This file was deleted.

13 changes: 13 additions & 0 deletions templates/htdocs/vendor/rss-bridge/rss-bridge/config.ini.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
; <?php exit; ?> DO NOT REMOVE THIS LINE

; This file contains the default settings for RSS-Bridge. Do not change this
; file, it will be replaced on the next update of RSS-Bridge! You can specify
; your own configuration in 'config.ini.php' (copy this file).

[system]

; Defines the timezone used by RSS-Bridge
; Find a list of supported timezones at
; https://www.php.net/manual/en/timezones.php
; timezone = "UTC" (default)
timezone = "Europe/Berlin"

0 comments on commit 7c48383

Please sign in to comment.