Diff Checker

Diff Checker is an online diff tool to compare text differences between two text files. Enter the contents of two files and click 'Find Difference!'
1.<?php 1.<?php
2./** 2./**
3. * The Header for our theme. 3. * The Header for our theme.
4. * 4. *
5. * Displays all of the <head> section and everything up till <div id="main"> 5. * Displays all of the <head> section and everything up till <div id="main">
6. * 6. *
7. * @package WordPress 7. * @package WordPress
8. * @subpackage Twenty_Eleven 8. * @subpackage Twenty_Eleven
9. * @since Twenty Eleven 1.0 9. * @since Twenty Eleven 1.0
10. */ 10. */
11.?><!DOCTYPE html> 11.?><!DOCTYPE html>
12.<!--[if IE 6]> 12.<!--[if IE 6]>
13.<html id="ie6" <?php language_attributes(); ?>> 13.<html id="ie6" <?php language_attributes(); ?>>
14.<![endif]--> 14.<![endif]-->
15.<!--[if IE 7]> 15.<!--[if IE 7]>
16.<html id="ie7" <?php language_attributes(); ?>> 16.<html id="ie7" <?php language_attributes(); ?>>
17.<![endif]--> 17.<![endif]-->
18.<!--[if IE 8]> 18.<!--[if IE 8]>
19.<html id="ie8" <?php language_attributes(); ?>> 19.<html id="ie8" <?php language_attributes(); ?>>
20.<![endif]--> 20.<![endif]-->
21.<!--[if !(IE 6) | !(IE 7) | !(IE 8) ]><!--> 21.<!--[if !(IE 6) | !(IE 7) | !(IE 8) ]><!-->
22.<html <?php language_attributes(); ?>> 22.<html <?php language_attributes(); ?>>
23.<!--<![endif]--> 23.<!--<![endif]-->
24.<head> 24.<head>
25.<link rel='stylesheet' id='jquery-lightbox-css' href='https\://www.everythingbutordinary.co.uk/wp-content/plugins/marketpress/marketpress-includes/lightbox/style/lumebox.css?ver=2.6.4' type='text/css' media='all' />
25.<meta charset="<?php bloginfo( 'charset' ); ?>" /> 26.<meta charset="<?php bloginfo( 'charset' ); ?>" />
26.<meta name="viewport" content="width=device-width" /> 27.<meta name="viewport" content="width=device-width" />
27.<title><?php 28.<title><?php
28. /* 29. /*
29. * Print the <title> tag based on what is being viewed. 30. * Print the <title> tag based on what is being viewed.
30. */ 31. */
31. global $page, $paged; 32. global $page, $paged;
32. 33.
33. wp_title( '|', true, 'right' ); 34. wp_title( '|', true, 'right' );
34. 35.
35. // Add the blog name. 36. // Add the blog name.
36. bloginfo( 'name' ); 37. bloginfo( 'name' );
37. 38.
38. // Add the blog description for the home/front page. 39. // Add the blog description for the home/front page.
39. $site_description = get_bloginfo( 'description', 'display' ); 40. $site_description = get_bloginfo( 'description', 'display' );
40. if ( $site_description && ( is_home() || is_front_page() ) ) 41. if ( $site_description && ( is_home() || is_front_page() ) )
41. echo " | $site_description"; 42. echo " | $site_description";
42. 43.
43. // Add a page number if necessary: 44. // Add a page number if necessary:
44. if ( $paged >= 2 || $page >= 2 ) 45. if ( $paged >= 2 || $page >= 2 )
45. echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ); 46. echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) );
46. 47.
47. ?></title> 48. ?></title>
48.<link rel="profile" href="http://gmpg.org/xfn/11" /> 49.<link rel="profile" href="https://gmpg.org/xfn/11" />
49.<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" /> 50.<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
50.<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" /> 51.<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
51.<!--[if lt IE 9]> 52.<!--[if lt IE 9]>
52.<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script> 53.<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
53.<![endif]--> 54.<![endif]-->
54.<?php 55.<?php
55. /* We add some JavaScript to pages with the comment form 56. /* We add some JavaScript to pages with the comment form
56. * to support sites with threaded comments (when in use). 57. * to support sites with threaded comments (when in use).
57. */ 58. */
58. if ( is_singular() && get_option( 'thread_comments' ) ) 59. if ( is_singular() && get_option( 'thread_comments' ) )
59. wp_enqueue_script( 'comment-reply' ); 60. wp_enqueue_script( 'comment-reply' );
60. 61.
61. /* Always have wp_head() just before the closing </head> 62. /* Always have wp_head() just before the closing </head>
62. * tag of your theme, or you will break many plugins, which 63. * tag of your theme, or you will break many plugins, which
63. * generally use this hook to add elements to <head> such 64. * generally use this hook to add elements to <head> such
64. * as styles, scripts, and meta tags. 65. * as styles, scripts, and meta tags.
65. */ 66. */
66. wp_head(); 67. wp_head();
67.?> 68.?>
69.<link href="https://fonts.googleapis.com/css?family=Carme" rel="stylesheet" type="text/css" />
68.</head> 70.</head>
69. 71.
70.<body <?php body_class(); ?>> 72.<body <?php body_class(); ?>>
71.<div id="page" class="hfeed"> 73.<div id="page" class="hfeed">
72. <header id="branding" role="banner"> 74. <header id="branding" role="banner">
73. <hgroup> 75. <hgroup>
74. <h1 id="site-title"><span><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1> 76. <h1 id="site-title"><span><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1>
75. <h2 id="site-description"><?php bloginfo( 'description' ); ?></h2> 77. <h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
76. </hgroup> 78. </hgroup>
77. 79.
80. <div class="header_advert"><a href="https://www.everythingbutordinary.co.uk/about/">EBO is an authorised retailer for all the products you see here</a></div>
81.
82.
83. <ul class="account_navigation">
84. <li><a href="https://www.everythingbutordinary.co.uk/store/order-status/">My Orders</a></li>
85. <li><a href="https://www.everythingbutordinary.co.uk/wp-admin/">Login</a></li>
86. <li><a href="https://www.everythingbutordinary.co.uk/services/">Customer Services</a></li>
87. </ul>
88.
89. <div class="widget-area" role="complementary">
90. <?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
91.
92. <?php
93. the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array( 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
94. ?>
95.
96. <?php endif; // end sidebar widget area ?>
97. </div><!-- .widget-area -->
98.
99.
100.
101. <nav id="access" role="navigation">
102. <h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3>
103. <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. */ ?>
104. <div class="skip-link"><a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to primary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to primary content', 'twentyeleven' ); ?></a></div>
105. <div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to secondary content', 'twentyeleven' ); ?></a></div>
106. <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assigned to the primary location is the one used. If one isn't assigned, the menu with the lowest ID is used. */ ?>
107. <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
108. </nav><!-- #access -->
109.
110. <?php
111. // Has the text been hidden?
112. if ( 'blank' == get_header_textcolor() ) :
113. ?>
114. <div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
115. <?php get_search_form(); ?>
116. </div>
117. <?php
118. else :
119. ?>
120. <?php get_search_form(); ?>
121. <?php endif; ?>
122.
123.
78. <?php 124. <?php
79. // Check to see if the header image has been removed 125. // Check to see if the header image has been removed
80. $header_image = get_header_image(); 126. $header_image = get_header_image();
81. if ( $header_image ) : 127. if ( $header_image ) :
82. // Compatibility with versions of WordPress prior to 3.4. 128. // Compatibility with versions of WordPress prior to 3.4.
83. if ( function_exists( 'get_custom_header' ) ) { 129. if ( function_exists( 'get_custom_header' ) ) {
84. // We need to figure out what the minimum width should be for our featured image. 130. // We need to figure out what the minimum width should be for our featured image.
85. // This result would be the suggested width if the theme were to implement flexible widths. 131. // This result would be the suggested width if the theme were to implement flexible widths.
86. $header_image_width = get_theme_support( 'custom-header', 'width' ); 132. $header_image_width = get_theme_support( 'custom-header', 'width' );
87. } else { 133. } else {
88. $header_image_width = HEADER_IMAGE_WIDTH; 134. $header_image_width = HEADER_IMAGE_WIDTH;
89. } 135. }
90. ?> 136. ?>
91. <a href="<?php echo esc_url( home_url( '/' ) ); ?>"> 137. <a href="<?php echo esc_url( home_url( '/' ) ); ?>">
92. <?php 138. <?php
93. // The header image 139. // The header image
94. // Check if this is a post or page, if it has a thumbnail, and if it's a big one 140. // Check if this is a post or page, if it has a thumbnail, and if it's a big one
95. if ( is_singular() && has_post_thumbnail( $post->ID ) && 141. if ( is_singular() && has_post_thumbnail( $post->ID ) &&
96. ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) && 142. ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
97. $image[1] >= $header_image_width ) : 143. $image[1] >= $header_image_width ) :
98. // Houston, we have a new header image! 144. // Houston, we have a new header image!
99. echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); 145. echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
100. else : 146. else :
101. // Compatibility with versions of WordPress prior to 3.4. 147. // Compatibility with versions of WordPress prior to 3.4.
102. if ( function_exists( 'get_custom_header' ) ) { 148. if ( function_exists( 'get_custom_header' ) ) {
103. $header_image_width = get_custom_header()->width; 149. $header_image_width = get_custom_header()->width;
104. $header_image_height = get_custom_header()->height; 150. $header_image_height = get_custom_header()->height;
105. } else { 151. } else {
106. $header_image_width = HEADER_IMAGE_WIDTH; 152. $header_image_width = HEADER_IMAGE_WIDTH;
107. $header_image_height = HEADER_IMAGE_HEIGHT; 153. $header_image_height = HEADER_IMAGE_HEIGHT;
108. } 154. }
109. ?> 155. ?>
110. <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo $header_image_height; ?>" alt="" /> 156. <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo $header_image_height; ?>" alt="" />
111. <?php endif; // end check for featured image or standard header ?> 157. <?php endif; // end check for featured image or standard header ?>
112. </a> 158. </a>
113. <?php endif; // end check for removed header image ?> 159. <?php endif; // end check for removed header image ?>
114. 160.
161. </header><!-- #branding -->
162.
115. <?php 163. <?php
116. // Has the text been hidden? 164.
117. if ( 'blank' == get_header_textcolor() ) : 165. if(get_query_var('page_id') == 5)
166.{ {
167. echo do_shortcode('[promoslider id="carousel" width="940" height="292" category="carousel"]');
168. }
118. ?> 169. ?>
119. <div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
120. <?php get_search_form(); ?>
121. </div>
122. <?php
123. else :
124. ?>
125. <?php get_search_form(); ?>
126. <?php endif; ?>
127. 170.
128. <nav id="access" role="navigation"> 171. <ul class="ads">
129. <h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3> 172. <li>
130. <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. */ ?> 173. <?php echo do_shortcode('[promoslider id="ad-slot-1" width="305" height="120" category="ad-slot-1"]'); ?>
131. <div class="skip-link"><a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to primary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to primary content', 'twentyeleven' ); ?></a></div> 174. </li>
132. <div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to secondary content', 'twentyeleven' ); ?></a></div> 175. <li>
133. <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assigned to the primary location is the one used. If one isn't assigned, the menu with the lowest ID is used. */ ?> 176. <?php echo do_shortcode('[promoslider id="ad-slot-2" width="305" height="120" category="ad-slot-2"]'); ?>
134. <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?> 177. </li>
135. </nav><!-- #access --> 178. <li>
136. </header><!-- #branding --> 179. <?php echo do_shortcode('[promoslider id="ad-slot-3" width="305" height="120" category="ad-slot-3"]'); ?>
180. </li>
181. </ul>
137. 182.
138. 183. <?php
139. <div id="main">184. }
185. //print_r($pagename);
186. ?>
187.
188. <!--
189.<li><a href="https://www.everythingbutordinary.co.uk/store/products/category/living/" title="Living"><img src="https://www.everythingbutordinary.co.uk/media/images/ad-living.jpg" width="300" height="120" border="0" /></a></li>
190.<li><a href="https://www.everythingbutordinary.co.uk/store/products/category/dining/" title="Dining"><img src="https://www.everythingbutordinary.co.uk/media/images/ad-dining.jpg" width="300" height="120" border="0" /></a></li>
191.<li><a href="https://www.everythingbutordinary.co.uk/store/products/category/lighting/" title="Lighting"><img src="https://www.everythingbutordinary.co.uk/media/images/ad-lighting.jpg" width="300" height="120" border="0" /></a></li>
192.</ul>
193. -->
194. <div id="main">
ORIGINAL TEXT
CHANGED TEXT