Fix header.php and footer.php

GoogleChromeLabs · Nov 1, 2017 · b4412c8 · b4412c8
1 parent f7e6cdd
commit b4412c8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ProgressiveWordPress",
-  "version": "0.0.3406",
+  "version": "0.0.3411",
   "description": "A Sample WordPress-based Progressive Web App.",
   "main": "index.js",
   "scripts": {

diff --git a/src/theme/footer.php b/src/theme/footer.php
@@ -13,8 +13,7 @@
    */
 ?>
 <?php
-  if ( defined( 'ABSPATH' ) )
-    require_once( ABSPATH . '/wp-load.php' );
+  require_once(dirname(__FILE__).'/../../../wp-load.php');
   etag_start();
 ?>
   </pwp-view>

diff --git a/src/theme/functions.php b/src/theme/functions.php
@@ -143,15 +143,9 @@ function pwa_theme_get_theme_color() {
   }
 
   function pwa_site_icon_url( $size ) {
-    $url = get_site_icon_url( $size );
-
+    $url =  get_site_icon_url( $size );
     if ( ! $url ) {
-      if ( ! function_exists( 'jetpack_site_icon_url' ) ) {
-        require_once( JETPACK__PLUGIN_DIR . 'modules/site-icon/site-icon-functions.php' );
-      }
-      $url = jetpack_site_icon_url( null, $size );
+      return sprintf('%s/images/icon.png', get_template_directory_uri());
     }
-
-    return $url;
   }
 ?>
diff --git a/src/theme/header.php b/src/theme/header.php
@@ -13,8 +13,7 @@
    */
 ?>
 <?php
-  if ( defined( 'ABSPATH' ) )
-    require_once( ABSPATH . '/wp-load.php' );
+  require_once(dirname(__FILE__).'/../../../wp-load.php');
   etag_start();
 ?>
 <!doctype html>