Clean up main file

dshanske · dshanske · commit f7cebe1d83a4 · 2019-12-30T03:38:33.000Z
diff --git a/mf2-feed.php b/mf2-feed.php
@@ -68,7 +68,7 @@ public static function do_feed_mf2( $for_comments ) {
 	 * @return string $json_str JSON encoded string
 	 */
 	public static function encode_json( $json, $feed = 'mf2' ) {
-		$options |= JSON_PRETTY_PRINT;
+		$options = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES;
 		/*
 		 * Options to be passed to json_encode()
 		 *
@@ -90,7 +90,6 @@ public static function do_feed_jf2( $for_comments ) {
 		} else {
 			load_template( dirname( __FILE__ ) . '/includes/feed-jf2.php' );
 		}
-		require_once dirname( __FILE__ ) . '/includes/class-mf2-feed-entry.php';
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static function do_feed_mf2( $for_comments ) {`
`68`	`68`	`* @return string $json_str JSON encoded string`
`69`	`69`	`*/`
`70`	`70`	`public static function encode_json( $json, $feed = 'mf2' ) {`
`71`		`- $options \|= JSON_PRETTY_PRINT;`
	`71`	`+ $options = JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES;`
`72`	`72`	`/*`
`73`	`73`	`* Options to be passed to json_encode()`
`74`	`74`	`*`
`@@ -90,7 +90,6 @@ public static function do_feed_jf2( $for_comments ) {`
`90`	`90`	`} else {`
`91`	`91`	`load_template( dirname( __FILE__ ) . '/includes/feed-jf2.php' );`
`92`	`92`	`}`
`93`		`- require_once dirname( __FILE__ ) . '/includes/class-mf2-feed-entry.php';`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`/**`