Completed
Push — master ( bf2509...4a16ad )
by Md. Mozahidur
03:47
created
inc/extras.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,17 +13,17 @@
 block discarded – undo
13 13
  * @param array $classes Classes for the body element.
14 14
  * @return array
15 15
  */
16
-function lighthouse_body_classes( $classes ) {
16
+function lighthouse_body_classes($classes) {
17 17
 	// Adds a class of group-blog to blogs with more than 1 published author.
18
-	if ( is_multi_author() ) {
18
+	if (is_multi_author()) {
19 19
 		$classes[] = 'group-blog';
20 20
 	}
21 21
 
22 22
 	// Adds a class of hfeed to non-singular pages.
23
-	if ( ! is_singular() ) {
23
+	if ( ! is_singular()) {
24 24
 		$classes[] = 'hfeed';
25 25
 	}
26 26
 
27 27
 	return $classes;
28 28
 }
29
-add_filter( 'body_class', 'lighthouse_body_classes' );
29
+add_filter('body_class', 'lighthouse_body_classes');
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Custom functions that act independently of the theme templates.
4
- *
5
- * Eventually, some of the functionality here could be replaced by core features.
6
- *
7
- * @package Lighthouse
8
- */
3
+	 * Custom functions that act independently of the theme templates.
4
+	 *
5
+	 * Eventually, some of the functionality here could be replaced by core features.
6
+	 *
7
+	 * @package Lighthouse
8
+	 */
9 9
 
10 10
 /**
11 11
  * Adds custom classes to the array of body classes.
Please login to merge, or discard this patch.
inc/customizer.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Lighthouse Theme Customizer.
4
- *
5
- * @package Lighthouse
6
- */
3
+	 * Lighthouse Theme Customizer.
4
+	 *
5
+	 * @package Lighthouse
6
+	 */
7 7
 
8 8
 /**
9 9
  * Add postMessage support for site title and description for the Theme Customizer.
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@
 block discarded – undo
10 10
  *
11 11
  * @param WP_Customize_Manager $wp_customize Theme Customizer object.
12 12
  */
13
-function lighthouse_customize_register( $wp_customize ) {
14
-	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
15
-	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
16
-	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
13
+function lighthouse_customize_register($wp_customize) {
14
+	$wp_customize->get_setting('blogname')->transport         = 'postMessage';
15
+	$wp_customize->get_setting('blogdescription')->transport  = 'postMessage';
16
+	$wp_customize->get_setting('header_textcolor')->transport = 'postMessage';
17 17
 }
18
-add_action( 'customize_register', 'lighthouse_customize_register' );
18
+add_action('customize_register', 'lighthouse_customize_register');
19 19
 
20 20
 /**
21 21
  * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
22 22
  */
23 23
 function lighthouse_customize_preview_js() {
24
-	wp_enqueue_script( 'lighthouse_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20130508', true );
24
+	wp_enqueue_script('lighthouse_customizer', get_template_directory_uri().'/js/customizer.js', array('customize-preview'), '20130508', true);
25 25
 }
26
-add_action( 'customize_preview_init', 'lighthouse_customize_preview_js' );
26
+add_action('customize_preview_init', 'lighthouse_customize_preview_js');
Please login to merge, or discard this patch.
inc/jetpack.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Jetpack Compatibility File.
4
- *
5
- * @link https://jetpack.me/
6
- *
7
- * @package Lighthouse
8
- */
3
+	 * Jetpack Compatibility File.
4
+	 *
5
+	 * @link https://jetpack.me/
6
+	 *
7
+	 * @package Lighthouse
8
+	 */
9 9
 
10 10
 /**
11 11
  * Jetpack setup function.
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	while ( have_posts() ) {
34 34
 		the_post();
35 35
 		if ( is_search() ) :
36
-		    get_template_part( 'template-parts/content', 'search' );
36
+			get_template_part( 'template-parts/content', 'search' );
37 37
 		else :
38
-		    get_template_part( 'template-parts/content', get_post_format() );
38
+			get_template_part( 'template-parts/content', get_post_format() );
39 39
 		endif;
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,27 +15,27 @@
 block discarded – undo
15 15
  */
16 16
 function lighthouse_jetpack_setup() {
17 17
 	// Add theme support for Infinite Scroll.
18
-	add_theme_support( 'infinite-scroll', array(
18
+	add_theme_support('infinite-scroll', array(
19 19
 		'container' => 'main',
20 20
 		'render'    => 'lighthouse_infinite_scroll_render',
21 21
 		'footer'    => 'page',
22
-	) );
22
+	));
23 23
 
24 24
 	// Add theme support for Responsive Videos.
25
-	add_theme_support( 'jetpack-responsive-videos' );
25
+	add_theme_support('jetpack-responsive-videos');
26 26
 }
27
-add_action( 'after_setup_theme', 'lighthouse_jetpack_setup' );
27
+add_action('after_setup_theme', 'lighthouse_jetpack_setup');
28 28
 
29 29
 /**
30 30
  * Custom render function for Infinite Scroll.
31 31
  */
32 32
 function lighthouse_infinite_scroll_render() {
33
-	while ( have_posts() ) {
33
+	while (have_posts()) {
34 34
 		the_post();
35
-		if ( is_search() ) :
36
-		    get_template_part( 'template-parts/content', 'search' );
35
+		if (is_search()) :
36
+		    get_template_part('template-parts/content', 'search');
37 37
 		else :
38
-		    get_template_part( 'template-parts/content', get_post_format() );
38
+		    get_template_part('template-parts/content', get_post_format());
39 39
 		endif;
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,8 +34,10 @@
 block discarded – undo
34 34
 		the_post();
35 35
 		if ( is_search() ) :
36 36
 		    get_template_part( 'template-parts/content', 'search' );
37
-		else :
37
+		else {
38
+			:
38 39
 		    get_template_part( 'template-parts/content', get_post_format() );
40
+		}
39 41
 		endif;
40 42
 	}
41 43
 }
Please login to merge, or discard this patch.
inc/custom-header.php 3 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Sample implementation of the Custom Header feature.
4
- *
5
- * You can add an optional custom header image to header.php like so ...
6
- *
3
+	 * Sample implementation of the Custom Header feature.
4
+	 *
5
+	 * You can add an optional custom header image to header.php like so ...
6
+	 *
7 7
 	<?php if ( get_header_image() ) : ?>
8 8
 	<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
9 9
 		<img src="<?php header_image(); ?>" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="">
10 10
 	</a>
11 11
 	<?php endif; // End header image check. ?>
12
- *
13
- * @link https://developer.wordpress.org/themes/functionality/custom-headers/
14
- *
15
- * @package Lighthouse
16
- */
12
+	 *
13
+	 * @link https://developer.wordpress.org/themes/functionality/custom-headers/
14
+	 *
15
+	 * @package Lighthouse
16
+	 */
17 17
 
18 18
 /**
19 19
  * Set up the WordPress core custom header feature.
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,18 +21,18 @@  discard block
 block discarded – undo
21 21
  * @uses lighthouse_header_style()
22 22
  */
23 23
 function lighthouse_custom_header_setup() {
24
-	add_theme_support( 'custom-header', apply_filters( 'lighthouse_custom_header_args', array(
24
+	add_theme_support('custom-header', apply_filters('lighthouse_custom_header_args', array(
25 25
 		'default-image'          => '',
26 26
 		'default-text-color'     => '000000',
27 27
 		'width'                  => 1000,
28 28
 		'height'                 => 250,
29 29
 		'flex-height'            => true,
30 30
 		'wp-head-callback'       => 'lighthouse_header_style',
31
-	) ) );
31
+	)));
32 32
 }
33
-add_action( 'after_setup_theme', 'lighthouse_custom_header_setup' );
33
+add_action('after_setup_theme', 'lighthouse_custom_header_setup');
34 34
 
35
-if ( ! function_exists( 'lighthouse_header_style' ) ) :
35
+if ( ! function_exists('lighthouse_header_style')) :
36 36
 /**
37 37
  * Styles the header image and text displayed on the blog.
38 38
  *
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * If no custom options for text are set, let's bail.
46 46
 	 * get_header_textcolor() options: Any hex value, 'blank' to hide text. Default: HEADER_TEXTCOLOR.
47 47
 	 */
48
-	if ( HEADER_TEXTCOLOR === $header_text_color ) {
48
+	if (HEADER_TEXTCOLOR === $header_text_color) {
49 49
 		return;
50 50
 	}
51 51
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	<style type="text/css">
55 55
 	<?php
56 56
 		// Has the text been hidden?
57
-		if ( ! display_header_text() ) :
57
+		if ( ! display_header_text()) :
58 58
 	?>
59 59
 		.site-title,
60 60
 		.site-description {
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	?>
68 68
 		.site-title a,
69 69
 		.site-description {
70
-			color: #<?php echo esc_attr( $header_text_color ); ?>;
70
+			color: #<?php echo esc_attr($header_text_color); ?>;
71 71
 		}
72 72
 	<?php endif; ?>
73 73
 	</style>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,11 +63,14 @@
 block discarded – undo
63 63
 		}
64 64
 	<?php
65 65
 		// If the user has set a custom color for the text use that.
66
-		else :
66
+		else {
67
+			:
67 68
 	?>
68 69
 		.site-title a,
69 70
 		.site-description {
70
-			color: #<?php echo esc_attr( $header_text_color ); ?>;
71
+			color: #<?php echo esc_attr( $header_text_color );
72
+		}
73
+		?>;
71 74
 		}
72 75
 	<?php endif; ?>
73 76
 	</style>
Please login to merge, or discard this patch.
page-template/page-home.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 <div class="container">
10 10
 	<div class="row">
11 11
 		<main id="main" class="site-main" role="main">
12
-			<?php while ( have_posts() ) : the_post(); ?>
12
+			<?php while (have_posts()) : the_post(); ?>
13 13
 				<section class="home-content">
14 14
 					<?php the_content(); ?>
15 15
 				</section>
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Template Name: Home
4
- *
5
- * @package Lighthouse
6
- */
3
+	 * Template Name: Home
4
+	 *
5
+	 * @package Lighthouse
6
+	 */
7 7
 get_header(); ?>
8 8
 
9 9
 <div class="container full-width">
Please login to merge, or discard this patch.
page-template/page-vc.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 <div class="container">
10 10
   <div class="row">
11 11
     <main id="main" class="site-main" role="main">
12
-      <?php while ( have_posts() ) : the_post(); ?>
12
+      <?php while (have_posts()) : the_post(); ?>
13 13
         <section class="home-content">
14 14
           <?php the_content(); ?>
15 15
         </section>
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Template Name: Template with Visual Editor
4
- *
5
- * @package Lighthouse
6
- */
3
+	 * Template Name: Template with Visual Editor
4
+	 *
5
+	 * @package Lighthouse
6
+	 */
7 7
 get_header(); ?>
8 8
 
9 9
 <div class="container">
Please login to merge, or discard this patch.
page.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@
 block discarded – undo
18 18
 		<div class="row">
19 19
 			<main id="main" class="site-main" role="main">
20 20
 				<?php
21
-				while ( have_posts() ) : the_post();
21
+				while (have_posts()) : the_post();
22 22
 
23
-					get_template_part( 'template-parts/content', 'page' );
23
+					get_template_part('template-parts/content', 'page');
24 24
 
25 25
 					// If comments are open or we have at least one comment, load up the comment template.
26
-					if ( comments_open() || get_comments_number() ) :
26
+					if (comments_open() || get_comments_number()) :
27 27
 						comments_template();
28 28
 					endif;
29 29
 
Please login to merge, or discard this patch.
single.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 				<main id="main" class="site-main" role="main">
25 25
 
26 26
 				<?php
27
-				while ( have_posts() ) : the_post();
27
+				while (have_posts()) : the_post();
28 28
 
29
-					$thumb_feature = wp_get_attachment_image_src( get_post_thumbnail_id(), 'lighthouse_feature_img');
29
+					$thumb_feature = wp_get_attachment_image_src(get_post_thumbnail_id(), 'lighthouse_feature_img');
30 30
 					$url_feature = $thumb_feature[0];
31 31
 				?> 
32 32
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 				</div>
36 36
 
37 37
 				<?php
38
-				get_template_part( 'template-parts/content', get_post_format() );
38
+				get_template_part('template-parts/content', get_post_format());
39 39
 
40 40
 					//the_post_navigation();
41 41
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 								<div class="thumbnail thumbnail-hover">
64 64
 								<?php
65
-									$thumb_post = wp_get_attachment_image_src( get_post_thumbnail_id(), 'lighthouse_related_post');
65
+									$thumb_post = wp_get_attachment_image_src(get_post_thumbnail_id(), 'lighthouse_related_post');
66 66
 									$url_post = $thumb_post[0];
67 67
 								?>
68 68
 									<img class="img-responsive" src="<?php echo $url_post; ?>">
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 			</div>
86 86
 		<div class="col-md-3 sidebar" role="complementary">
87
-			<?php dynamic_sidebar( 'blog_widgets' ); ?>
87
+			<?php dynamic_sidebar('blog_widgets'); ?>
88 88
 		</div>
89 89
 		</div><!-- .row -->
90 90
 	</div><!-- #primary -->
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * The template for displaying all single posts.
4
- *
5
- * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#single-post
6
- *
7
- * @package Lighthouse
8
- */
3
+		 * The template for displaying all single posts.
4
+		 *
5
+		 * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#single-post
6
+		 *
7
+		 * @package Lighthouse
8
+		 */
9 9
 
10 10
 get_header(); ?>
11 11
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 							<?php
59 59
 							 $postslist = get_posts('numberposts=99&order=DESC&orderby=date');
60 60
 							 foreach ($postslist as $post) :
61
-							    setup_postdata($post);
61
+								setup_postdata($post);
62 62
 							 ?>
63 63
 							 <div class="col-xs-12">
64 64
 							 <div class="entry">
Please login to merge, or discard this patch.
header.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * The header for our theme.
4
- *
5
- * This is the template that displays all of the <head> section and everything up until <div id="content">
6
- *
7
- * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
8
- *
9
- * @package Lighthouse
10
- */
3
+		 * The header for our theme.
4
+		 *
5
+		 * This is the template that displays all of the <head> section and everything up until <div id="content">
6
+		 *
7
+		 * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
8
+		 *
9
+		 * @package Lighthouse
10
+		 */
11 11
 
12 12
 ?><!DOCTYPE html>
13 13
 <html <?php language_attributes(); ?>>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,17 +12,17 @@  discard block
 block discarded – undo
12 12
 ?><!DOCTYPE html>
13 13
 <html <?php language_attributes(); ?>>
14 14
 <head>
15
-	<meta charset="<?php bloginfo( 'charset' ); ?>">
15
+	<meta charset="<?php bloginfo('charset'); ?>">
16 16
 	<meta name="viewport" content="width=device-width, initial-scale=1">
17 17
 	<link rel="profile" href="http://gmpg.org/xfn/11">
18
-	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
18
+	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
19 19
 
20 20
 	<?php wp_head(); ?>
21 21
 </head>
22 22
 
23 23
 <body <?php body_class(); ?>>
24 24
 	<div id="page" class="site">
25
-		<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'lighthouse' ); ?></a>
25
+		<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e('Skip to content', 'lighthouse'); ?></a>
26 26
 
27 27
 		<header id="masthead" class="site-header panel-top panel-fixed" role="banner">
28 28
 			<div class="container">
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 									$xml 	= simplexml_load_file($url);
50 50
 									$price 	= $xml->CurrentPrice;
51 51
 									$change = $xml->Change;
52
-									$change_pcent 	= $xml->PercentageChange;
52
+									$change_pcent = $xml->PercentageChange;
53 53
 									$volume = $xml->Volume;
54 54
 
55 55
 									echo "Share Price: ";
@@ -69,13 +69,13 @@  discard block
 block discarded – undo
69 69
 							<button id="textplus">A+</button>
70 70
 							<button id="textminus">A-</button>
71 71
 						</div>
72
-						<form role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
72
+						<form role="search" method="get" action="<?php echo esc_url(home_url('/')); ?>">
73 73
 						    <div class="search-wrap">
74
-						    	<label class="screen-reader-text" for="s"><?php _e( 'Search for:', 'presentation' ); ?></label>
74
+						    	<label class="screen-reader-text" for="s"><?php _e('Search for:', 'presentation'); ?></label>
75 75
 						    	 <button type="submit">
76 76
 					                <i class="fa fa-search"></i>
77 77
 					            </button>
78
-						        <input type="search" placeholder="<?php echo esc_attr( 'Search', 'presentation' ); ?>" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" />
78
+						        <input type="search" placeholder="<?php echo esc_attr('Search', 'presentation'); ?>" name="s" value="<?php echo esc_attr(get_search_query()); ?>" />
79 79
 						    </div>
80 80
 						</form>
81 81
 					</div>
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 							</div>
89 89
 						</div>
90 90
 						<div class="col-sm-12 col-md-2 col-lg-2 header-center-area">
91
-							<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
92
-								<img src="<?php echo get_template_directory_uri()?>/images/lighthouse-logo.svg" alt="<?php echo( get_bloginfo( 'title' ) ); ?>" />
91
+							<a href="<?php echo esc_url(home_url('/')); ?>" rel="home">
92
+								<img src="<?php echo get_template_directory_uri()?>/images/lighthouse-logo.svg" alt="<?php echo(get_bloginfo('title')); ?>" />
93 93
 							</a>
94 94
 
95 95
 							<div class="iv-module live-search">
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 											<div class="container">
103 103
 												<div class="row">
104 104
 													<div class="col-md-12">
105
-														<form method="get" action="<?php echo esc_url( home_url( '/' ) );?>">
106
-															<label for="s"><?php _e('Type &amp; hit enter to search', 'ivan_domain');?></label>
107
-															<input type="search" name="s" id="s" placeholder="<?php echo esc_attr__('Type &amp; hit enter to search', 'lighthouse');?>" />
105
+														<form method="get" action="<?php echo esc_url(home_url('/')); ?>">
106
+															<label for="s"><?php _e('Type &amp; hit enter to search', 'ivan_domain'); ?></label>
107
+															<input type="search" name="s" id="s" placeholder="<?php echo esc_attr__('Type &amp; hit enter to search', 'lighthouse'); ?>" />
108 108
 															<a class="submit-form" href="#"><i class="fa fa-search"></i></a>
109 109
 															<div class="clearfix"></div>
110 110
 														</form>
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
 											<div class="container">
132 132
 												<div class="row">
133 133
 													<div class="col-md-12">
134
-														<form method="get" action="<?php echo esc_url( home_url( '/' ) );?>">
135
-															<label for="s"><?php _e('Type &amp; hit enter', 'ivan_domain');?></label>
136
-															<input type="search" name="s" id="s" placeholder="<?php echo esc_attr__('Type &amp; hit enter', 'lighthouse');?>" />
134
+														<form method="get" action="<?php echo esc_url(home_url('/')); ?>">
135
+															<label for="s"><?php _e('Type &amp; hit enter', 'ivan_domain'); ?></label>
136
+															<input type="search" name="s" id="s" placeholder="<?php echo esc_attr__('Type &amp; hit enter', 'lighthouse'); ?>" />
137 137
 															<a class="submit-form" href="#"><i class="fa fa-search"></i></a>
138 138
 															<div class="clearfix"></div>
139 139
 														</form>
Please login to merge, or discard this patch.