Changeset 1708734

Timestamp:

08/05/2017 03:59:01 AM (7 years ago)

Author:

batmoo

Message:

Update to 0.5

​https://github.com/Automattic/amp-wp/releases/tag/0.5

Location:

amp/trunk

Files:

• amp.php (modified) (7 diffs)
• assets/images/placeholder-icon.png (modified) (previous)
• includes/admin/class-amp-customizer.php (modified) (3 diffs)
• includes/admin/functions.php (modified) (3 diffs)
• includes/amp-helper-functions.php (modified) (2 diffs)
• includes/amp-post-template-actions.php (modified) (10 diffs)
• includes/amp-post-template-functions.php (modified) (1 diff)
• includes/class-amp-content.php (modified) (3 diffs)
• includes/class-amp-post-template.php (modified) (10 diffs)
• includes/embeds/class-amp-dailymotion-embed.php (added)
• includes/embeds/class-amp-gallery-embed.php (modified) (1 diff)
• includes/embeds/class-amp-instagram-embed.php (modified) (1 diff)
• includes/embeds/class-amp-pinterest-embed.php (added)
• includes/embeds/class-amp-soundcloud-embed.php (added)
• includes/embeds/class-amp-vimeo-embed.php (added)
• includes/embeds/class-amp-vine-embed.php (modified) (1 diff)
• includes/embeds/class-amp-youtube-embed.php (modified) (3 diffs)
• includes/lib/class-fastimage.php (deleted)
• includes/lib/fasterimage (added)
• includes/lib/fasterimage/Exception (added)
• includes/lib/fasterimage/Exception/InvalidImageException.php (added)
• includes/lib/fasterimage/ExifParser.php (added)
• includes/lib/fasterimage/FasterImage.php (added)
• includes/lib/fasterimage/ImageParser.php (added)
• includes/lib/fasterimage/Stream (added)
• includes/lib/fasterimage/Stream/Exception (added)
• includes/lib/fasterimage/Stream/Exception/StreamBufferTooSmallException.php (added)
• includes/lib/fasterimage/Stream/Stream.php (added)
• includes/lib/fasterimage/Stream/StreamableInterface.php (added)
• includes/lib/fasterimage/amp-fasterimage.php (added)
• includes/lib/fastimage (added)
• includes/lib/fastimage/class-fastimage.php (added)
• includes/options (added)
• includes/options/class-amp-analytics-options-submenu.php (added)
• includes/options/class-amp-options-menu.php (added)
• includes/options/views (added)
• includes/options/views/class-amp-analytics-options-submenu-page.php (added)
• includes/options/views/class-amp-options-manager.php (added)
• includes/options/views/class-amp-options-menu-page.php (added)
• includes/sanitizers/class-amp-allowed-tags-generated.php (added)
• includes/sanitizers/class-amp-base-sanitizer.php (modified) (1 diff)
• includes/sanitizers/class-amp-blacklist-sanitizer.php (modified) (7 diffs)
• includes/sanitizers/class-amp-iframe-sanitizer.php (modified) (2 diffs)
• includes/sanitizers/class-amp-img-sanitizer.php (modified) (3 diffs)
• includes/sanitizers/class-amp-playbuzz-sanitizer.php (added)
• includes/sanitizers/class-amp-style-sanitizer.php (modified) (2 diffs)
• includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php (added)
• includes/sanitizers/class-amp-video-sanitizer.php (modified) (2 diffs)
• includes/settings/class-amp-customizer-design-settings.php (modified) (8 diffs)
• includes/utils/class-amp-dom-utils.php (modified) (1 diff)
• includes/utils/class-amp-html-utils.php (modified) (1 diff)
• includes/utils/class-amp-image-dimension-extractor.php (modified) (3 diffs)
• includes/utils/class-amp-string-utils.php (modified) (1 diff)
• includes/utils/class-amp-wp-utils.php (added)
• jetpack-helper.php (modified) (2 diffs)
• readme-assets (added)
• readme-assets/amp-options-analytics.png (added)
• readme-assets/analytics-option-entries.png (added)
• readme-assets/invalid-input.png (added)
• readme-assets/options-saved.png (added)
• readme.md (modified) (11 diffs)
• readme.txt (modified) (5 diffs)
• templates/footer.php (modified) (1 diff)
• templates/header-bar.php (modified) (1 diff)
• templates/meta-author.php (modified) (1 diff)
• templates/style.php (modified) (1 diff)

amp/trunk/amp.php

@@ -6 +6 @@
  * Author: Automattic
  * Author URI: https://automattic.com
- * Version: 0.4.2
+ * Version: 0.
  * Text Domain: amp
  * Domain Path: /languages/
@@ -14 +14 @@
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '0.4.2' );
+define( 'AMP__VERSION', '0.' );
 
 require_once( AMP__DIR__ . '/back-compat/back-compat.php' );
@@ -61 +61 @@
     add_filter( 'request', 'amp_force_query_var_value' );
     add_action( 'wp', 'amp_maybe_add_actions' );
+
+
+
 
     if ( class_exists( 'Jetpack' ) && ! ( defined( 'IS_WPCOM' ) && IS_WPCOM ) ) {
@@ -115 +118 @@
     require_once( AMP__DIR__ . '/includes/amp-post-template-actions.php' );
     require_once( AMP__DIR__ . '/includes/amp-post-template-functions.php' );
+
 }
 
@@ -122 +126 @@
 
 function amp_render() {
+
+
+
+
+
+
+
+
+
+
+
     amp_load_classes();
 
-    $post_id = get_queried_object_id();
     do_action( 'pre_amp_render_post', $post_id );
 
@@ -130 +144 @@
     $template = new AMP_Post_Template( $post_id );
     $template->load();
-    exit;
 }
 
@@ -158 +171 @@
 }
 add_action( 'plugins_loaded', '_amp_bootstrap_customizer', 9 );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

amp/trunk/includes/admin/class-amp-customizer.php

@@ -47 +47 @@
         // Our custom panels only need to go for AMP Customizer requests though
         if ( self::is_amp_customizer() ) {
-            if ( empty( $_GET['url'] ) ) {
+            if ( empty( $_GET['url'] ) ) {
                 $wp_customize->set_preview_url( amp_admin_get_preview_permalink() );
             }
@@ -157 +157 @@
 
     public function force_mobile_preview( $devices ) {
-        if ( isset( $devices[ 'mobile' ] ) ) {
+        if ( isset( $devices[] ) ) {
             $devices['mobile']['default'] = true;
             unset( $devices['desktop']['default'] );
@@ -166 +166 @@
 
     public static function is_amp_customizer() {
-        return ! empty( $_REQUEST[ AMP_CUSTOMIZER_QUERY_VAR ] );
+        return ! empty( $_REQUEST[ AMP_CUSTOMIZER_QUERY_VAR ] );
     }
 }

amp/trunk/includes/admin/functions.php

@@ -1 +1 @@
 <?php
 // Callbacks for adding AMP-related things to the admin.
+
+
+
 
 define( 'AMP_CUSTOMIZER_QUERY_VAR', 'customize_amp' );
@@ -23 +26 @@
 }
 
-/**
- * Registers a submenu page to access the AMP template editor panel in the Customizer.
- */
-function amp_add_customizer_link() {
-    // Teensy little hack on menu_slug, but it works. No redirect!
-    $menu_slug = add_query_arg( array(
-        'autofocus[panel]'         => AMP_Template_Customizer::PANEL_ID,
-        'return'                   => rawurlencode( admin_url() ),
-        AMP_CUSTOMIZER_QUERY_VAR   => true,
-    ), 'customize.php' );
-
-    // Add the theme page.
-    $page = add_theme_page(
-        __( 'AMP', 'amp' ),
-        __( 'AMP', 'amp' ),
-        'edit_theme_options',
-        $menu_slug
-    );
-}
-
 function amp_admin_get_preview_permalink() {
     /**
-     * Filter the post type to retrieve the latest of for use in the AMP template customizer.
+     * Filter the post type to retrieve the latest for use in the AMP template customizer.
      *
      * @param string $post_type Post type slug. Default 'post'.
@@ -70 +53 @@
     return amp_get_permalink( $post_id );
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

amp/trunk/includes/amp-helper-functions.php

@@ -8 +8 @@
     }
 
-    if ( '' != get_option( 'permalink_structure' ) ) {
+    $structure = get_option( 'permalink_structure' );
+    if ( empty( $structure ) ) {
+        $amp_url = add_query_arg( AMP_QUERY_VAR, 1, get_permalink( $post_id ) );
+    } else {
         $amp_url = trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( AMP_QUERY_VAR, 'single_amp' );
-    } else {
-        $amp_url = add_query_arg( AMP_QUERY_VAR, 1, get_permalink( $post_id ) );
     }
 
@@ -40 +41 @@
  */
 function is_amp_endpoint() {
+
+
+
+
     return false !== get_query_var( AMP_QUERY_VAR, false );
 }

amp/trunk/includes/amp-post-template-actions.php

@@ -2 +2 @@
 // Callbacks for adding content to an AMP template
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_title' );
+function amp_post_template_init_hooks() {
+    add_action( 'amp_post_template_head', 'amp_post_template_add_title' );
+    add_action( 'amp_post_template_head', 'amp_post_template_add_canonical' );
+    add_action( 'amp_post_template_head', 'amp_post_template_add_scripts' );
+    add_action( 'amp_post_template_head', 'amp_post_template_add_fonts' );
+    add_action( 'amp_post_template_head', 'amp_post_template_add_boilerplate_css' );
+    add_action( 'amp_post_template_head', 'amp_post_template_add_schemaorg_metadata' );
+    add_action( 'amp_post_template_css', 'amp_post_template_add_styles', 99 );
+    add_action( 'amp_post_template_data', 'amp_post_template_add_analytics_script' );
+    add_action( 'amp_post_template_footer', 'amp_post_template_add_analytics_data' );
+}
+
 function amp_post_template_add_title( $amp_template ) {
     ?>
@@ -9 +20 @@
 }
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_canonical' );
 function amp_post_template_add_canonical( $amp_template ) {
     ?>
@@ -16 +26 @@
 }
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_scripts' );
 function amp_post_template_add_scripts( $amp_template ) {
     $scripts = $amp_template->get( 'amp_component_scripts', array() );
-    foreach ( $scripts as $element => $script ) : ?>
-        <script custom-element="<?php echo esc_attr( $element ); ?>" src="<?php echo esc_url( $script ); ?>" async></script>
+    foreach ( $scripts as $element => $script ) :
+        $custom_type = ($element == 'amp-mustache') ? 'template' : 'element'; ?>
+        <script custom-<?php echo esc_attr( $custom_type ); ?>="<?php echo esc_attr( $element ); ?>" src="<?php echo esc_url( $script ); ?>" async></script>
     <?php endforeach; ?>
     <script src="<?php echo esc_url( $amp_template->get( 'amp_runtime_script' ) ); ?>" async></script>
@@ -26 +36 @@
 }
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_fonts' );
 function amp_post_template_add_fonts( $amp_template ) {
     $font_urls = $amp_template->get( 'font_urls', array() );
-    foreach( $font_urls as $slug => $url ) : ?>
+    foreach( $font_urls as $slug => $url ) : ?>
         <link rel="stylesheet" href="<?php echo esc_url( $url ); ?>">
     <?php endforeach;
 }
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_boilerplate_css' );
 function amp_post_template_add_boilerplate_css( $amp_template ) {
     ?>
@@ -41 +49 @@
 }
 
-add_action( 'amp_post_template_head', 'amp_post_template_add_schemaorg_metadata' );
 function amp_post_template_add_schemaorg_metadata( $amp_template ) {
     $metadata = $amp_template->get( 'metadata' );
@@ -48 +55 @@
     }
     ?>
-    <script type="application/ld+json"><?php echo json_encode( $metadata ); ?></script>
+    <script type="application/ld+json"><?php echo json_encode( $metadata ); ?></script>
     <?php
 }
 
-add_action( 'amp_post_template_css', 'amp_post_template_add_styles', 99 );
 function amp_post_template_add_styles( $amp_template ) {
     $styles = $amp_template->get( 'post_amp_styles' );
@@ -58 +64 @@
         echo '/* Inline styles */' . PHP_EOL;
         foreach ( $styles as $selector => $declarations ) {
-            $declarations = implode( ";", $declarations ) . ";";
+            $declarations = implode( ;
             printf( '%1$s{%2$s}', $selector, $declarations );
         }
@@ -64 +70 @@
 }
 
-add_action( 'amp_post_template_data', 'amp_post_template_add_analytics_script' );
 function amp_post_template_add_analytics_script( $data ) {
     if ( ! empty( $data['amp_analytics'] ) ) {
@@ -72 +77 @@
 }
 
-add_action( 'amp_post_template_footer', 'amp_post_template_add_analytics_data' );
 function amp_post_template_add_analytics_data( $amp_template ) {
     $analytics_entries = $amp_template->get( 'amp_analytics' );
@@ -81 +85 @@
     foreach ( $analytics_entries as $id => $analytics_entry ) {
         if ( ! isset( $analytics_entry['type'], $analytics_entry['attributes'], $analytics_entry['config_data'] ) ) {
-            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Analytics entry for %s is missing one of the following keys: `type`, `attributes`, or `config_data` (array keys: %s)', 'amp' ), esc_html( $id ), esc_html( implode( ', ', array_keys( $analytics_entry ) ) ) ), '0.3.2' );
+            _doing_it_wrong( __FUNCTION__, sprintf( __( 'Analytics entry for %s is missing one of the following keys: `type`, `attributes`, or `config_data` (array keys: %s)', 'amp' ), esc_html( $id ), esc_html( implode( ', ', array_keys( $analytics_entry ) ) ) ), '0.3.2' );
             continue;
         }
-
         $script_element = AMP_HTML_Utils::build_tag( 'script', array(
             'type' => 'application/json',
-        ), json_encode( $analytics_entry['config_data'] ) );
+        ), json_encode( $analytics_entry['config_data'] ) );
 
         $amp_analytics_attr = array_merge( array(

amp/trunk/includes/amp-post-template-functions.php

@@ -9 +9 @@
 
         // 3 or 6 hex digits, or the empty string.
-        if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+        if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
             return $color;
         }

amp/trunk/includes/class-amp-content.php

@@ -64 +64 @@
 
             if ( ! is_subclass_of( $embed_handler, 'AMP_Base_Embed_Handler' ) ) {
-                _doing_it_wrong( __METHOD__, sprintf( __( 'Embed Handler (%s) must extend `AMP_Embed_Handler`', 'amp' ), $embed_handler_class ), '0.1' );
+                _doing_it_wrong( __METHOD__, sprintf( __( 'Embed Handler (%s) must extend `AMP_Embed_Handler`', 'amp' ), $embed_handler_class ), '0.1' );
                 continue;
             }
@@ -100 +100 @@
         foreach ( $sanitizer_classes as $sanitizer_class => $args ) {
             if ( ! class_exists( $sanitizer_class ) ) {
-                _doing_it_wrong( __METHOD__, sprintf( __( 'Sanitizer (%s) class does not exist', 'amp' ), esc_html( $sanitizer_class ) ), '0.4.1' );
+                _doing_it_wrong( __METHOD__, sprintf( __( 'Sanitizer (%s) class does not exist', 'amp' ), esc_html( $sanitizer_class ) ), '0.4.1' );
                 continue;
             }
@@ -107 +107 @@
 
             if ( ! is_subclass_of( $sanitizer, 'AMP_Base_Sanitizer' ) ) {
-                _doing_it_wrong( __METHOD__, sprintf( __( 'Sanitizer (%s) must extend `AMP_Base_Sanitizer`', 'amp' ), esc_html( $sanitizer_class ) ), '0.1' );
+                _doing_it_wrong( __METHOD__, sprintf( __( 'Sanitizer (%s) must extend `AMP_Base_Sanitizer`', 'amp' ), esc_html( $sanitizer_class ) ), '0.1' );
                 continue;
             }

amp/trunk/includes/class-amp-post-template.php

@@ -4 +4 @@
 require_once( AMP__DIR__ . '/includes/utils/class-amp-html-utils.php' );
 require_once( AMP__DIR__ . '/includes/utils/class-amp-string-utils.php' );
+
 
 require_once( AMP__DIR__ . '/includes/class-amp-content.php' );
@@ -9 +10 @@
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-style-sanitizer.php' );
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-blacklist-sanitizer.php' );
+
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-img-sanitizer.php' );
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-video-sanitizer.php' );
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-iframe-sanitizer.php' );
 require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-audio-sanitizer.php' );
+
 
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-twitter-embed.php' );
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-youtube-embed.php' );
+
+
+
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-gallery-embed.php' );
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-instagram-embed.php' );
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-vine-embed.php' );
 require_once( AMP__DIR__ . '/includes/embeds/class-amp-facebook-embed.php' );
+
 
 class AMP_Post_Template {
@@ -70 +77 @@
                 'merriweather' => 'https://fonts.googleapis.com/css?family=Merriweather:400,400italic,700,700italic',
             ),
+
+
 
             /**
@@ -82 +91 @@
              */
             'amp_analytics' => apply_filters( 'amp_post_template_analytics', array(), $this->post ),
-        );
+        );
 
         $this->build_post_content();
@@ -96 +105 @@
             return $this->data[ $property ];
         } else {
-            _doing_it_wrong( __METHOD__, sprintf( __( 'Called for non-existant key ("%s").', 'amp' ), esc_html( $property ) ), '0.1' );
+            _doing_it_wrong( __METHOD__, sprintf( __( 'Called for non-existant key ("%s").', 'amp' ), esc_html( $property ) ), '0.1' );
         }
 
@@ -224 +233 @@
                 'AMP_Twitter_Embed_Handler' => array(),
                 'AMP_YouTube_Embed_Handler' => array(),
+
+
+
                 'AMP_Instagram_Embed_Handler' => array(),
                 'AMP_Vine_Embed_Handler' => array(),
                 'AMP_Facebook_Embed_Handler' => array(),
+
                 'AMP_Gallery_Embed_Handler' => array(),
             ), $this->post ),
             apply_filters( 'amp_content_sanitizers', array(
                  'AMP_Style_Sanitizer' => array(),
-                 'AMP_Blacklist_Sanitizer' => array(),
+                 'AMP_Blacklist_Sanitizer' => array(),
                  'AMP_Img_Sanitizer' => array(),
                  'AMP_Video_Sanitizer' => array(),
                  'AMP_Audio_Sanitizer' => array(),
+
                  'AMP_Iframe_Sanitizer' => array(
                      'add_placeholder' => true,
                  ),
+
             ), $this->post ),
             array(
@@ -246 +261 @@
         $this->add_data_by_key( 'post_amp_content', $amp_content->get_amp_content() );
         $this->merge_data_for_key( 'amp_component_scripts', $amp_content->get_amp_scripts() );
-        $this->add_data_by_key( 'post_amp_styles', $amp_content->get_amp_styles() );
+        $this->_key( 'post_amp_styles', $amp_content->get_amp_styles() );
     }
 
@@ -275 +290 @@
             array( 'AMP_Img_Sanitizer' => array() ),
             array(
-                'content_max_width' => $this->get( 'content_max_width' )
+                'content_max_width' => $this->get( 'content_max_width' )
             )
         );
@@ -289 +304 @@
 
         if ( $featured_styles ) {
-            $this->add_data_by_key( 'post_amp_styles', $featured_styles );
+            $this->_key( 'post_amp_styles', $featured_styles );
         }
     }
@@ -382 +397 @@
         $file = apply_filters( 'amp_post_template_file', $file, $template_type, $this->post );
         if ( ! $this->is_valid_template( $file ) ) {
-            _doing_it_wrong( __METHOD__, sprintf( __( 'Path validation for template (%s) failed. Path cannot traverse and must be located in `%s`.', 'amp' ), esc_html( $file ), 'WP_CONTENT_DIR' ), '0.1' );
+            _doing_it_wrong( __METHOD__, sprintf( __( 'Path validation for template (%s) failed. Path cannot traverse and must be located in `%s`.', 'amp' ), esc_html( $file ), 'WP_CONTENT_DIR' ), '0.1' );
             return;
         }

amp/trunk/includes/embeds/class-amp-gallery-embed.php

@@ -40 +40 @@
             'include'    => '',
             'exclude'    => '',
-            'size'       => array( $this->args['width'], $this->args['height'] )
+            'size'       => array( $this->args['width'], $this->args['height'] )
         ), $attr, 'gallery' );
 

amp/trunk/includes/embeds/class-amp-instagram-embed.php

@@ -53 +53 @@
 
     public function oembed( $matches, $attr, $url, $rawattr ) {
-        return $this->render( array( 'url' => $url, 'instagram_id' =>  end( $matches ) ) );
+        return $this->render( array( 'url' => $url, 'instagram_id' => end( $matches ) ) );
     }
 

amp/trunk/includes/embeds/class-amp-vine-embed.php

@@ -29 +29 @@
 
     public function oembed( $matches, $attr, $url, $rawattr ) {
-        return $this->render( array( 'url' => $url, 'vine_id' =>  end( $matches ) ) );
+        return $this->render( array( 'url' => $url, 'vine_id' => end( $matches ) ) );
     }
 

amp/trunk/includes/embeds/class-amp-youtube-embed.php

@@ -49 +49 @@
         if ( isset( $attr[0] ) ) {
             $url = ltrim( $attr[0] , '=' );
-        } elseif ( function_exists ( 'shortcode_new_to_old_params' ) ) {
+        } elseif ( function_exists( 'shortcode_new_to_old_params' ) ) {
             $url = shortcode_new_to_old_params( $attr );
         }
@@ -93 +93 @@
     private function get_video_id_from_url( $url ) {
         $video_id = false;
-        $parsed_url = parse_url( $url );
+        $parsed_url = parse_url( $url );
 
         if ( self::SHORT_URL_HOST === substr( $parsed_url['host'], -strlen( self::SHORT_URL_HOST ) ) ) {
@@ -114 +114 @@
             $parts = explode( '/', $parsed_url['path'] );
 
-            if ( in_array( $parts[1], array( 'v', 'e', 'embed' ) ) ) {
+            if ( in_array( $parts[1], array( 'v', 'e', 'embed' ) ) ) {
                 $video_id = $parts[2];
             }

amp/trunk/includes/sanitizers/class-amp-base-sanitizer.php

@@ -43 +43 @@
 
         if ( AMP_String_Utils::endswith( $value, '%' ) ) {
-            if ( 'width' === $dimension && isset( $this->args[ 'content_max_width'] ) ) {
+            if ( 'width' === $dimension && isset( $this->args['content_max_width'] ) ) {
                 $percentage = absint( $value ) / 100;
-                return round( $percentage * $this->args[ 'content_max_width'] );
+                return round( $percentage * $this->args['content_max_width'] );
             }
         }

amp/trunk/includes/sanitizers/class-amp-blacklist-sanitizer.php

@@ -8 +8 @@
  * See following for blacklist:
  *     https://github.com/ampproject/amphtml/blob/master/spec/amp-html-format.md#html-tags
+
+
+
  */
 class AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
@@ -29 +32 @@
 
     private function strip_attributes_recursive( $node, $bad_attributes, $bad_protocols ) {
-        if ( $node->nodeType !== XML_ELEMENT_NODE ) {
+        if (  ) {
             return;
         }
@@ -37 +40 @@
         // Some nodes may contain valid content but are themselves invalid.
         // Remove the node but preserve the children.
-        if ( 'font' === $node_name ) {
+        if ( 'font' === $node_name ) {
             $this->replace_node_with_children( $node, $bad_attributes, $bad_protocols );
             return;
@@ -50 +53 @@
                 $attribute = $node->attributes->item( $i );
                 $attribute_name = strtolower( $attribute->name );
-                if ( in_array( $attribute_name, $bad_attributes ) ) {
+                if ( in_array( $attribute_name, $bad_attributes ) ) {
                     $node->removeAttribute( $attribute_name );
                     continue;
@@ -56 +59 @@
 
                 // on* attributes (like onclick) are a special case
-                if ( 0 === stripos( $attribute_name, 'on' ) && $attribute_name != 'on' ) {
+                if ( 0 === stripos( $attribute_name, 'on' ) &&  ) {
                     $node->removeAttribute( $attribute_name );
                     continue;
@@ -125 +128 @@
         $href = $node->getAttribute( 'href' );
 
-        // If no href is set and this isn't an anchor, it's invalid
         if ( empty( $href ) ) {
-            $name_attr = $node->getAttribute( 'name' );
-            if ( ! empty( $name_attr ) ) {
-                // No further validation is required
-                return true;
-            } else {
-                return false;
-            }
+            // If no href, check that a is an anchor or not.
+            // We don't need to validate anchors any further.
+            return $node->hasAttribute( 'name' ) || $node->hasAttribute( 'id' );
         }
 
@@ -151 +149 @@
 
         if ( false === filter_var( $href, FILTER_VALIDATE_URL )
-            && ! in_array( $protocol, $special_protocols ) ) {
+            && ! in_array( $protocol, $special_protocols ) ) {
             return false;
         }
 
-        if ( ! in_array( $protocol, $valid_protocols ) ) {
+        if ( ! in_array( $protocol, $valid_protocols ) ) {
             return false;
         }

amp/trunk/includes/sanitizers/class-amp-iframe-sanitizer.php

@@ -98 +98 @@
                     break;
 
-
                 case 'frameborder':
                     if ( '0' !== $value && '1' !== $value ) {
@@ -118 +117 @@
         }
 
-        if ( ! isset( $out[ 'sandbox' ] ) ) {
-            $out[ 'sandbox' ] = self::SANDBOX_DEFAULTS;
+        if ( ! isset( $out[] ) ) {
+            $out[] = self::SANDBOX_DEFAULTS;
         }
 

amp/trunk/includes/sanitizers/class-amp-img-sanitizer.php

@@ -19 +19 @@
 
     public function sanitize() {
+
         $nodes = $this->dom->getElementsByTagName( self::$tag );
+
+
         $num_nodes = $nodes->length;
+
         if ( 0 === $num_nodes ) {
             return;
@@ -27 +31 @@
         for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
             $node = $nodes->item( $i );
-            $old_attributes = AMP_DOM_Utils::get_node_attributes_as_assoc_array( $node );
 
-            if ( empty( $old_attributes['src'] ) ) {
+            if (  ) ) {
                 $node->parentNode->removeChild( $node );
                 continue;
             }
 
-            $new_attributes = $this->filter_attributes( $old_attributes );
+            // Determine which images need their dimensions determined/extracted.
+            if ( '' === $node->getAttribute( 'width' ) || '' === $node->getAttribute( 'height' ) ) {
+                $need_dimensions[ $node->getAttribute( 'src' ) ][] = $node;
+            } else {
+                $this->adjust_and_replace_node( $node );
+            }
+        }
 
-            // Try to extract dimensions for the image, if not set.
-            if ( ! isset( $new_attributes['width'] ) || ! isset( $new_attributes['height'] ) ) {
-                $dimensions = AMP_Image_Dimension_Extractor::extract( $new_attributes['src'] );
-                if ( is_array( $dimensions ) ) {
-                    $new_attributes['width'] = $dimensions[0];
-                    $new_attributes['height'] = $dimensions[1];
+        $this->determine_dimensions( $need_dimensions );
+        $this->adjust_and_replace_nodes_in_array_map( $need_dimensions );
+    }
+
+    /**
+     * Figure out width and height attribute values for images that don't have them by
+     * attempting to determine actual dimensions and setting reasonable defaults otherwise.
+     *
+     * @param array $need_dimensions List of Img src url to node mappings corresponding to images that need dimensions.
+     */
+    private function determine_dimensions( $need_dimensions ) {
+        $dimensions_by_url = AMP_Image_Dimension_Extractor::extract( array_keys( $need_dimensions ) );
+
+        foreach ( $dimensions_by_url as $url => $dimensions ) {
+            foreach ( $need_dimensions[ $url ] as $node ) {
+                // Provide default dimensions for images whose dimensions we couldn't fetch.
+                if ( false === $dimensions ) {
+                    $width = isset( $this->args['content_max_width'] ) ? $this->args['content_max_width'] : self::FALLBACK_WIDTH;
+                    $height = self::FALLBACK_HEIGHT;
+                    $node->setAttribute( 'width', $width );
+                    $node->setAttribute( 'height', $height );
+                    $class = $node->hasAttribute( 'class' ) ? $node->getAttribute( 'class' ) . ' amp-wp-unknown-size' : 'amp-wp-unknown-size';
+                    $node->setAttribute( 'class', $class );
+                } else {
+                    $node->setAttribute( 'width', $dimensions['width'] );
+                    $node->setAttribute( 'height', $dimensions['height'] );
                 }
             }
+
+
 
-            // Final fallback when we have no dimensions.
-            if ( ! isset( $new_attributes['width'] ) || ! isset( $new_attributes['height'] ) ) {
-                $new_attributes['width'] = isset( $this->args['content_max_width'] ) ? $this->args['content_max_width'] : self::FALLBACK_WIDTH;
-                $new_attributes['height'] = self::FALLBACK_HEIGHT;
+    /**
+     * Make final modifications to DOMNode
+     *
+     * @param DOMNode $node The DOMNode to adjust and replace
+     */
+    private function adjust_and_replace_node( $node ) {
+        $old_attributes = AMP_DOM_Utils::get_node_attributes_as_assoc_array( $node );
+        $new_attributes = $this->filter_attributes( $old_attributes );
+        $new_attributes = $this->enforce_sizes_attribute( $new_attributes );
+        if ( $this->is_gif_url( $new_attributes['src'] ) ) {
+            $this->did_convert_elements = true;
+            $new_tag = 'amp-anim';
+        } else {
+            $new_tag = 'amp-img';
+        }
+        $new_node = AMP_DOM_Utils::create_node( $this->dom, $new_tag, $new_attributes );
+        $node->parentNode->replaceChild( $new_node, $node );
+    }
 
-                $this->add_or_append_attribute( $new_attributes, 'class', 'amp-wp-unknown-size' );
+    /**
+     * Now that all images have width and height attributes, make final tweaks and replace original image nodes
+     *
+     * @param array $node_lists Img DOM nodes (now with width and height attributes).
+     */
+    private function adjust_and_replace_nodes_in_array_map( $node_lists ) {
+        foreach ( $node_lists as $node_list ) {
+            foreach ( $node_list as $node ) {
+                $this->adjust_and_replace_node( $node );
             }
-
-            $new_attributes = $this->enforce_sizes_attribute( $new_attributes );
-
-            if ( $this->is_gif_url( $new_attributes['src'] ) ) {
-                $this->did_convert_elements = true;
-                $new_tag = 'amp-anim';
-            } else {
-                $new_tag = 'amp-img';
-            }
-
-            $new_node = AMP_DOM_Utils::create_node( $this->dom, $new_tag, $new_attributes );
-            $node->parentNode->replaceChild( $new_node, $node );
         }
     }
@@ -104 +145 @@
     private function is_gif_url( $url ) {
         $ext = self::$anim_extension;
-        $path = parse_url( $url, PHP_URL_PATH );
-        return $ext === substr( $path, -strlen( $ext ) );
+        $path = parse_url( $url, PHP_URL_PATH );
+        return ;
     }
 }

amp/trunk/includes/sanitizers/class-amp-style-sanitizer.php

@@ -19 +19 @@
 
     private function collect_styles_recursive( $node ) {
-        if ( $node->nodeType !== XML_ELEMENT_NODE ) {
+        if (  ) {
             return;
         }
@@ -57 +57 @@
         }
 
-        // Normalize order
-        $styles = array_map( 'trim', explode( ';', $string ) );
+        // safecss returns a string but we want individual rules.
+        // Using preg_split to break up rules by `;` but only if the semi-colon is not inside parens (like a data-encoded image).
+        $styles = array_map( 'trim', preg_split( "/;(?![^(]*\))/", $string ) );
+
+        // Normalize the order of the styles
         sort( $styles );
 

amp/trunk/includes/sanitizers/class-amp-video-sanitizer.php

@@ -10 +10 @@
 
     public static $tag = 'video';
+
+
+
+
+
+
+
+
+
+
+
 
     public function sanitize() {
@@ -51 +62 @@
                 $node->parentNode->replaceChild( $new_node, $node );
             }
+
+
         }
     }

amp/trunk/includes/settings/class-amp-customizer-design-settings.php

@@ -24 +24 @@
             'default'           => self::DEFAULT_HEADER_COLOR,
             'sanitize_callback' => 'sanitize_hex_color',
-            'transport'         => 'postMessage'
+            'transport'         => 'postMessage'
         ) );
 
@@ -32 +32 @@
             'default'           => self::DEFAULT_HEADER_BACKGROUND_COLOR,
             'sanitize_callback' => 'sanitize_hex_color',
-            'transport'         => 'postMessage'
+            'transport'         => 'postMessage'
         ) );
 
@@ -40 +40 @@
             'default'           => self::DEFAULT_COLOR_SCHEME,
             'sanitize_callback' => array( __CLASS__ , 'sanitize_color_scheme' ),
-            'transport'         => 'postMessage'
+            'transport'         => 'postMessage'
         ) );
     }
 
-    public function register_customizer_ui( $wp_customize ) {
+    public function register_customizer_ui( $wp_customize ) {
         $wp_customize->add_section( 'amp_design', array(
             'title' => __( 'Design', 'amp' ),
@@ -56 +56 @@
                 'label'    => __( 'Header Text Color', 'amp' ),
                 'section'  => 'amp_design',
-                'priority' => 10
+                'priority' => 10
             ) )
         );
@@ -66 +66 @@
                 'label'    => __( 'Header Background & Link Color', 'amp' ),
                 'section'  => 'amp_design',
-                'priority' => 20
+                'priority' => 20
             ) )
         );
@@ -110 +110 @@
     protected static function get_color_scheme_names() {
         return array(
-            'light'   => __( 'Light', 'amp'),
+            'light'   => __( 'Light', 'amp'),
             'dark'    => __( 'Dark', 'amp' ),
         );
@@ -130 +130 @@
                 'muted_text_color' => '#b1b1b1',
                 'border_color'     => '#707070',
-            )
+            )
         );
     }
@@ -148 +148 @@
         $scheme_slugs = array_keys( $schemes );
 
-        if ( ! in_array( $value, $scheme_slugs ) ) {
+        if ( ! in_array( $value, $scheme_slugs ) ) {
             $value = self::DEFAULT_COLOR_SCHEME;
         }

amp/trunk/includes/utils/class-amp-dom-utils.php

@@ -96 +96 @@
             // Not all are valid AMP, but we include them for completeness.
             $self_closing_tags = array(
-                'area', 'base', 'basefont', 'bgsound', 'br', 'col', 'embed', 'frame', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr',
+                'area',
+                'base',
+                'basefont',
+                'bgsound',
+                'br',
+                'col',
+                'embed',
+                'frame',
+                'hr',
+                'img',
+                'input',
+                'keygen',
+                'link',
+                'meta',
+                'param',
+                'source',
+                'track',
+                'wbr',
             );
         }
 
-        return in_array( $tag, $self_closing_tags );
+        return in_array( $tag, $self_closing_tags );
     }
 }

amp/trunk/includes/utils/class-amp-html-utils.php

@@ -18 +18 @@
         return implode( ' ', $string );
     }
+
+
+
+
+
+
+
+
+
+
+
+
 }

amp/trunk/includes/utils/class-amp-image-dimension-extractor.php

@@ -3 +3 @@
 class AMP_Image_Dimension_Extractor {
     static $callbacks_registered = false;
-
-    static public function extract( $url ) {
+    const STATUS_FAILED_LAST_ATTEMPT = 'failed';
+    const STATUS_IMAGE_EXTRACTION_FAILED = 'failed';
+
+    static public function extract( $urls ) {
         if ( ! self::$callbacks_registered ) {
             self::register_callbacks();
         }
 
-        $url = self::normalize_url( $url );
-        if ( false === $url ) {
-            return false;
-        }
-
-        return apply_filters( 'amp_extract_image_dimensions', false, $url );
+        $valid_urls = array();
+        foreach ( $urls as $url ) {
+            $url = self::normalize_url( $url );
+            if ( false !== $url ) {
+                $valid_urls[] = $url;
+            }
+        }
+
+        $dimensions = array_fill_keys( $valid_urls, false );
+        $dimensions = apply_filters( 'amp_extract_image_dimensions_batch', $dimensions );
+
+        return $dimensions;
     }
 
@@ -30 +38 @@
         }
 
-        $parsed = parse_url( $url );
+        $parsed = parse_url( $url );
         if ( ! isset( $parsed['host'] ) ) {
             $path = '';
@@ -48 +56 @@
         self::$callbacks_registered = true;
 
-        add_filter( 'amp_extract_image_dimensions', array( __CLASS__, 'extract_from_attachment_metadata' ), 10, 2 );
-        add_filter( 'amp_extract_image_dimensions', array( __CLASS__, 'extract_by_downloading_image' ), 999, 2 ); // Run really late since this is our last resort
-
-        do_action( 'amp_extract_image_dimensions_callbacks_registered' );
-    }
-
-    public static function extract_from_attachment_metadata( $dimensions, $url ) {
-        if ( is_array( $dimensions ) ) {
-            return $dimensions;
-        }
-
-        $url = strtok( $url, '?' );
-        $attachment_id = attachment_url_to_postid( $url );
-        if ( empty( $attachment_id ) ) {
-            return false;
-        }
-
-        $metadata = wp_get_attachment_metadata( $attachment_id );
-        if ( ! $metadata ) {
-            return false;
-        }
-
-        return array( $metadata['width'], $metadata['height'] );
-    }
-
-    public static function extract_by_downloading_image( $dimensions, $url ) {
-        if ( is_array( $dimensions ) ) {
-            return $dimensions;
-        }
-
-        $url_hash = md5( $url );
-        $transient_name = sprintf( 'amp_img_%s', $url_hash );
-        $transient_expiry = 30 * DAY_IN_SECONDS;
-        $transient_fail = 'fail';
-
-        $dimensions = get_transient( $transient_name );
-
-        if ( is_array( $dimensions ) ) {
-            return $dimensions;
-        } elseif ( $transient_fail === $dimensions ) {
-            return false;
-        }
-
-        // Very simple lock to prevent stampedes
-        $transient_lock_name = sprintf( 'amp_lock_%s', $url_hash );
-        if ( false !== get_transient( $transient_lock_name ) ) {
-            return false;
-        }
-        set_transient( $transient_lock_name, 1, MINUTE_IN_SECONDS );
-
-        // Note to other developers: please don't use this class directly as it may not stick around forever...
+        add_filter( 'amp_extract_image_dimensions_batch', array( __CLASS__, 'extract_by_downloading_images' ), 999, 1 );
+
+        do_action( 'amp_extract_image_dimensions_batch_callbacks_registered' );
+    }
+
+    /**
+     * Extract dimensions from downloaded images (or transient/cached dimensions from downloaded images)
+     *
+     * @param array  $dimensions Image urls mapped to dimensions.
+     * @param string $mode Whether image dimensions should be extracted concurrently or synchronously.
+     * @return array Dimensions mapped to image urls, or false if they could not be retrieved
+     */
+    public static function extract_by_downloading_images( $dimensions, $mode = 'concurrent' ) {
+        $transient_expiration = 30 * DAY_IN_SECONDS;
+
+        $urls_to_fetch = array();
+        $images = array();
+
+        self::determine_which_images_to_fetch( $dimensions, $urls_to_fetch );
+        self::fetch_images( $urls_to_fetch, $images, $mode );
+        self::process_fetched_images( $urls_to_fetch, $images, $dimensions, $transient_expiration );
+
+        return $dimensions;
+    }
+
+    /**
+     * Determine which images to fetch by checking for dimensions in transient/cache.
+     * Creates a short lived transient that acts as a semaphore so that another visitor
+     * doesn't trigger a remote fetch for the same image at the same time.
+     *
+     * @param array $dimensions Image urls mapped to dimensions.
+     * @param array $urls_to_fetch Urls of images to fetch because dimensions are not in transient/cache.
+     */
+    private static function determine_which_images_to_fetch( &$dimensions, &$urls_to_fetch ) {
+        foreach ( $dimensions as $url => $value ) {
+
+            // Check whether some other callback attached to the filter already provided dimensions for this image.
+            if ( is_array( $value ) ) {
+                continue;
+            }
+
+            $url_hash = md5( $url );
+            $transient_name = sprintf( 'amp_img_%s', $url_hash );
+            $cached_dimensions = get_transient( $transient_name );
+
+            // If we're able to retrieve the dimensions from a transient, set them and move on.
+            if ( is_array( $cached_dimensions ) ) {
+                $dimensions[ $url ] = array(
+                    'width' => $cached_dimensions[0],
+                    'height' => $cached_dimensions[1],
+                );
+                continue;
+            }
+
+            // If the value in the transient reflects we couldn't get dimensions for this image the last time we tried, move on.
+            if ( self::STATUS_FAILED_LAST_ATTEMPT === $cached_dimensions ) {
+                $dimensions[ $url ] = false;
+                continue;
+            }
+
+            $transient_lock_name = sprintf( 'amp_lock_%s', $url_hash );
+
+            // If somebody is already trying to extract dimensions for this transient right now, move on.
+            if ( false !== get_transient( $transient_lock_name ) ) {
+                $dimensions[ $url ] = false;
+                continue;
+            }
+
+            // Include the image as a url to fetch.
+            $urls_to_fetch[ $url ] = array();
+            $urls_to_fetch[ $url ]['url'] = $url;
+            $urls_to_fetch[ $url ]['transient_name'] = $transient_name;
+            $urls_to_fetch[ $url ]['transient_lock_name'] = $transient_lock_name;
+            set_transient( $transient_lock_name, 1, MINUTE_IN_SECONDS );
+        }
+    }
+
+    /**
+     * Fetch dimensions of remote images
+     *
+     * @param array  $urls_to_fetch Image src urls to fetch.
+     * @param array  $images Array to populate with results of image/dimension inspection.
+     * @param string $mode Whether image dimensions should be extracted concurrently or synchronously.
+     */
+    private static function fetch_images( $urls_to_fetch, &$images, $mode ) {
+        // Use FasterImage when for compatible PHP versions
+        if ( 'synchronous' === $mode ||
+            false === function_exists( 'curl_multi_exec' ) ||
+            version_compare( PHP_VERSION, '5.4.0' ) < 0
+        ) {
+            self::fetch_images_via_fast_image( $urls_to_fetch, $images );
+        } else {
+            self::fetch_images_via_faster_image( $urls_to_fetch, $images );
+        }
+    }
+
+    /**
+     * Fetch images via FastImage library
+     *
+     * @param array $urls_to_fetch Image src urls to fetch.
+     * @param array $images Array to populate with results of image/dimension inspection.
+     */
+    private static function fetch_images_via_fast_image( $urls_to_fetch, &$images ) {
         if ( ! class_exists( 'FastImage' ) ) {
-            require_once( AMP__DIR__ . '/includes/lib/class-fastimage.php' );
-        }
-
-        // TODO: look into using curl+stream (https://github.com/willwashburn/FasterImage)
-        $image = new FastImage( $url );
-        $dimensions = $image->getSize();
-
-        if ( ! is_array( $dimensions ) ) {
-            set_transient( $transient_name, $transient_fail, $transient_expiry );
-            delete_transient( $transient_lock_name );
-            return false;
-        }
-
-        set_transient( $transient_name, $dimensions, $transient_expiry );
-        delete_transient( $transient_lock_name );
-        return $dimensions;
+            require_once( AMP__DIR__ . '/includes/lib/fastimage/class-fastimage.php' );
+        }
+
+        $image = new FastImage();
+        $urls = array_keys( $urls_to_fetch );
+
+        foreach ( $urls as $url ) {
+            $result = $image->load( $url );
+            if ( false === $result ) {
+                $images[ $url ]['size'] = self::STATUS_IMAGE_EXTRACTION_FAILED;
+            } else {
+                $size = $image->getSize();
+                $images[ $url ]['size'] = $size;
+            }
+        }
+    }
+
+    /**
+     * Fetch images via FasterImage library
+     *
+     * @param array $urls_to_fetch Image src urls to fetch.
+     * @param array $images Array to populate with results of image/dimension inspection.
+     */
+    private static function fetch_images_via_faster_image( $urls_to_fetch, &$images ) {
+        $urls = array_keys( $urls_to_fetch );
+
+        if ( ! function_exists( 'amp_get_fasterimage_client' ) ) {
+            require_once( AMP__DIR__ . '/includes/lib/fasterimage/amp-fasterimage.php' );
+        }
+
+        $user_agent = apply_filters( 'amp_extract_image_dimensions_get_user_agent', self::get_default_user_agent() );
+        $client = amp_get_fasterimage_client( $user_agent );
+        $images = $client->batch( $urls );
+    }
+
+    /**
+     * Determine success or failure of remote fetch, integrate fetched dimensions into url to dimension mapping,
+     * cache fetched dimensions via transient and release/delete semaphore transient
+     *
+     * @param array $urls_to_fetch List of image urls that were fetched and transient names corresponding to each (for unlocking semaphore, setting "real" transient).
+     * @param array $images Results of remote fetch mapping fetched image url to dimensions.
+     * @param array $dimensions Map of image url to dimensions to be updated with results of remote fetch.
+     * @param int   $transient_expiration Duration image dimensions should exist in transient/cache.
+     */
+    private static function process_fetched_images( $urls_to_fetch, $images, &$dimensions, $transient_expiration ) {
+        foreach ( $urls_to_fetch as $url_data ) {
+            $image_data = $images[ $url_data['url'] ];
+            if ( self::STATUS_IMAGE_EXTRACTION_FAILED === $image_data['size'] ) {
+                $dimensions[ $url_data['url'] ] = false;
+                set_transient( $url_data['transient_name'], self::STATUS_FAILED_LAST_ATTEMPT, $transient_expiration );
+            } else {
+                $dimensions[ $url_data['url'] ] = array(
+                    'width' => $image_data['size'][0],
+                    'height' => $image_data['size'][1],
+                );
+                set_transient(
+                    $url_data['transient_name'],
+                    array(
+                        $image_data['size'][0],
+                        $image_data['size'][1],
+                    ),
+                    $transient_expiration
+                );
+            }
+            delete_transient( $url_data['transient_lock_name'] );
+        }
+    }
+
+
+    /**
+     * Get default user agent
+     *
+     * @return string
+     */
+    public static function get_default_user_agent() {
+        return 'amp-wp, v' . AMP__VERSION . ', ' . get_site_url();
     }
 }

amp/trunk/includes/utils/class-amp-string-utils.php

@@ -5 +5 @@
         return '' !== $haystack
             && '' !== $needle
-            && $needle === substr( $haystack, -strlen( $needle ) );
+            && ;
     }
 }

amp/trunk/jetpack-helper.php

@@ -57 +57 @@
         $tz = get_option( 'gmt_offset' );
         $v = 'ext';
-        $blog_url = parse_url( site_url() );
+        $blog_url = parse_url( site_url() );
         $srv = $blog_url['host'];
         $j = sprintf( '%s:%s', JETPACK__API_VERSION, JETPACK__VERSION );
@@ -64 +64 @@
     }
 
-    $data['host'] = rawurlencode( $_SERVER['HTTP_HOST'] );
+    $data['host'] = 
     $data['rand'] = 'RANDOM'; // amp placeholder
     $data['ref'] = 'DOCUMENT_REFERRER'; // amp placeholder

amp/trunk/readme.md

@@ -5 +5 @@
 This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
 
-With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/2016/01/01/amp-on/?amp=1`
+With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/amp=1`
 
 Note #1: that Pages and archives are not currently supported.
@@ -54 +54 @@
 #### Logo Only
 
-If you want to hide the site text and just show a logo, use the `amp_post_template_css` action. The following colours the title bar black, hides the site title, and replaces it with a centered logo:
-
-```
+If you want to hide the site text and just show a logo, use the `amp_post_template_css` action. The following colors the title bar black, hides the site title, and replaces it with a centered logo:
+
+```
 add_action( 'amp_post_template_css', 'xyz_amp_additional_css_styles' );
 
@@ -62 +62 @@
     // only CSS here please...
     ?>
-    nav.amp-wp-title-bar {
+    r {
         padding: 12px 0;
         background: #000;
     }
-    nav.amp-wp-title-bar a {
+    r a {
         background-image: url( 'https://example.com/path/to/logo.png' );
         background-repeat: no-repeat;
@@ -80 +80 @@
 ```
 
-Note: you will need to adjust the colours and sizes based on your brand.
+Note: you will need to adjust the colors and sizes based on your brand.
 
 ### Template Tweaks
@@ -88 +88 @@
 #### Featured Image
 
-The default template does not display the featured image currently. There are many ways to add it, such as the snippet below:
-
-```php
-add_action( 'pre_amp_render_post', 'xyz_amp_add_custom_actions' );
-function xyz_amp_add_custom_actions() {
-    add_filter( 'the_content', 'xyz_amp_add_featured_image' );
-}
-
-function xyz_amp_add_featured_image( $content ) {
-    if ( has_post_thumbnail() ) {
-        // Just add the raw <img /> tag; our sanitizer will take care of it later.
-        $image = sprintf( '<p class="xyz-featured-image">%s</p>', get_the_post_thumbnail() );
-        $content = $image . $content;
-    }
-    return $content;
+The default template displays the featured image. If you don't want to display the featured image in your amp page, use the following code:
+
+```php
+add_filter( 'amp_post_template_data', 'xyz_amp_remove_featured_image' );
+
+function xyz_amp_remove_featured_image( $data ) {
+    $data['featured_image'] = false;
+    return $data;
 }
 ```
@@ -137 +130 @@
 The plugin adds some default metadata to enable ["Rich Snippet" support](https://developers.google.com/structured-data/rich-snippets/articles). You can modify this using the `amp_post_template_metadata` filter. The following changes the type annotation to `NewsArticle` (from the default `BlogPosting`) and overrides the default Publisher Logo.
 
-```
+```
 add_filter( 'amp_post_template_metadata', 'xyz_amp_modify_json_metadata', 10, 2 );
 
@@ -315 +308 @@
 * You must trigger the `amp_post_template_head` action in the `<head>` section:
 
-```
+```
 do_action( 'amp_post_template_head', $this );
 ```
@@ -321 +314 @@
 * You must trigger the `amp_post_template_footer` action right before the `</body>` tag:
 
-```
+```
 do_action( 'amp_post_template_footer', $this );
 ```
@@ -396 +389 @@
 
     public function get_scripts() {
-        return array( 'amp-mustache' => 'https://cdn.ampproject.org/v0/amp-mustache-0.1.js' );
+        return array(
+            'amp-mustache' => 'https://cdn.ampproject.org/v0/amp-mustache-0.1.js',
+            'amp-list' => 'https://cdn.ampproject.org/v0/amp-list-0.1.js',
+        );
     }
 
@@ -491 +487 @@
 ```
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ## Analytics
 
-To output proper analytics tags, you can use the `amp_post_template_analytics` filter:
-
-```
+There are two options you can follow to include analytics tags in your posts.
+
+### Plugin Analytics Options
+
+The plugin defines an analytics option to enable the addition of
+[amp-analytics](https://www.ampproject.org/docs/reference/components/amp-analytics) in your posts. When the plugin is
+ active, an AMP top-level menu appears in the Dashboard with one inner sub-menu called 'Analytics':
+
+ ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/amp-options-analytics.png)
+
+ Selecting the `Analytics` sub-menu in the AMP options menu takes us to an Analytics Options entry page, where we can
+  define the analytics tags we want to have, by specifying the vendor type (e.g. Parsely), and the associated  JSON 
+  configuration.
+
+ ![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/analytics-option-entries.png)
+
+Notice that the goal of this option of the plugin is to provide a simple mechanism to insert analytics tags;
+ it provides very simple validation based solely on the validity of the JSON string provided. It is the users 
+ responsibility to make sure that the values in the configuration string and the vendor type used are coherent with 
+ the analytics requirements of their site . Please review the documentation in the [AMP project ](https://github.com/ampproject/amphtml/blob/master/extensions/amp-analytics/amp-analytics.md) and in [AMPByExample](https://ampbyexample.com/components/amp-analytics/).
+ 
+ The AMP Analytics options entry form provides a very simple validation feedback mechanism: if the JSON configuration 
+ string entered is invalid (i.e. not valid  JSON), an error message (in red) is displayed below the title of the 
+ options window and the entry form is reloaded:
+    
+![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/invalid-input.png)
+    
+And, if the configuration provided is actually a valid JSON string, a success message (in green) is displayed at the 
+top of the window below the title, and again the entry form is reloaded. 
+
+![AMP Options Menu](https://github.com/Automattic/amp-wp/blob/amedina/amp-analytics-customizer/readme-assets/options-saved.png)
+
+### Manually
+
+Alaternatively, you can use the `amp_post_template_analytics` filter:
+
+```php
 add_filter( 'amp_post_template_analytics', 'xyz_amp_add_custom_analytics' );
 function xyz_amp_add_custom_analytics( $analytics ) {
@@ -557 +650 @@
 If you want a custom template for your post type:
 
-```
+```
 add_filter( 'amp_post_template_file', 'xyz_amp_set_review_template', 10, 3 );
 

amp/trunk/readme.txt

@@ -2 +2 @@
 Contributors: batmoo, joen, automattic, potatomaster
 Tags: amp, mobile
-Requires at least: 4.4
+Requires at least: 4.
 Tested up to: 4.8
-Stable tag: 0.4.2
+Stable tag: 0.
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -14 +14 @@
 This plugin adds support for the [Accelerated Mobile Pages](https://www.ampproject.org) (AMP) Project, which is an an open source initiative that aims to provide mobile optimized content that can load instantly everywhere.
 
-With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/2016/01/01/amp-on/?amp=1`
+With the plugin active, all posts on your site will have dynamically generated AMP-compatible versions, accessible by appending `/amp/` to the end your post URLs. For example, if your post URL is `http://example.com/2016/01/01/amp-on/`, you can access the AMP version at `http://example.com/2016/01/01/amp-on/amp/`. If you do not have [pretty permalinks](https://codex.wordpress.org/Using_Permalinks#mod_rewrite:_.22Pretty_Permalinks.22) enabled, you can do the same thing by appending `?amp=1`, i.e. `http://example.com/amp=1`
 
 Note #1: that Pages and archives are not currently supported. Pages support is being worked on.
@@ -32 +32 @@
 = How do I customize the AMP output for my site? =
 
-You can tweak a few things like colours from the AMP Customizer. From the Dashboard, go to `Appearance > AMP`.
+You can tweak a few things like colors from the AMP Customizer. From the Dashboard, go to `Appearance > AMP`.
 
 For deeper level customizations, please see the readme at https://github.com/Automattic/amp-wp/blob/master/readme.md
@@ -54 +54 @@
 == Changelog ==
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 = 0.4.2 (2016-10-13) =
 
@@ -73 +89 @@
 - New template: spiffy, shiny, and has the fresh theme smell (props allancole and the Automattic Theme Team).
 - *Warning*: The template update has potential breaking changes. Please see https://wordpress.org/support/topic/v0-4-whats-new-and-possible-breaking-changes/
-- AMP Customizer: Pick your colours and make the template your own (props DrewAPicture and 10up)
+- AMP Customizer: Pick your colors and make the template your own (props DrewAPicture and 10up)
 - Fix: support for inline styles (props coreymckrill).
 - Fix: no more fatal errors when tags not supported by post type (props david-binda)

amp/trunk/templates/footer.php

@@ -3 +3 @@
         <h2><?php echo esc_html( $this->get( 'blog_name' ) ); ?></h2>
         <p>
-            <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'amp' ) ); ?>"><?php printf( __( 'Powered by %s', 'amp' ), 'WordPress' ); ?></a>
+            <a href="<?php echo esc_url(  ); ?></a>
         </p>
-        <a href="#top" class="back-to-top"><?php _e( 'Back to top', 'amp' ); ?></a>
+        <a href="#top" class="back-to-top"><?php _e( 'Back to top', 'amp' ); ?></a>
     </div>
 </footer>

amp/trunk/templates/header-bar.php

@@ -3 +3 @@
         <a href="<?php echo esc_url( $this->get( 'home_url' ) ); ?>">
             <?php $site_icon_url = $this->get( 'site_icon_url' );
-                if ( $site_icon_url ) : ?>
+            if ( $site_icon_url ) : ?>
                 <amp-img src="<?php echo esc_url( $site_icon_url ); ?>" width="32" height="32" class="amp-wp-site-icon"></amp-img>
             <?php endif; ?>

amp/trunk/templates/meta-author.php

@@ -1 +1 @@
 <?php $post_author = $this->get( 'post_author' ); ?>
 <?php if ( $post_author ) : ?>
-    <?php $author_avatar_url = get_avatar_url( $post_author->user_email, array( 'size' => 24 ) ); ?>
     <div class="amp-wp-meta amp-wp-byline">
         <?php if ( function_exists( 'get_avatar_url' ) ) : ?>
-            <amp-img src="<?php echo esc_url( $author_avatar_url ); ?>" width="24" height="24" layout="fixed"></amp-img>
+            <amp-img src="<?php echo esc_url(  ); ?>" width="24" height="24" layout="fixed"></amp-img>
         <?php endif; ?>
         <span class="amp-wp-author author vcard"><?php echo esc_html( $post_author->display_name ); ?></span>

amp/trunk/templates/style.php

@@ -135 +135 @@
     /** site icon is 32px **/
     background-color: <?php echo sanitize_hex_color( $header_color ); ?>;
-    border: 1px solid <?php echo sanitize_hex_color(  $header_color ); ?>;
+    border: 1px solid <?php echo sanitize_hex_color( $header_color ); ?>;
     border-radius: 50%;
     position: absolute;