Changeset 32106

Timestamp:

04/10/2015 09:07:42 PM (10 years ago)

Author:

azaozz

Message:

Press This: check the bookmarklet version and add the update notice from PHP.
Fixes #31942.

Location:

trunk/src

Files:

• wp-admin/css/press-this.css (modified) (1 diff)
• wp-admin/includes/class-wp-press-this.php (modified) (3 diffs)
• wp-admin/js/press-this.js (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/src/wp-admin/css/press-this.css

@@ -1252 +1252 @@
 }
 
-.alert.is-hidden {
-    display: none;
-}
 .alert.is-error:before {
     background: red;

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -15 +15 @@
 class WP_Press_This {
 
+    // Used to trigger the bookmarklet update notice.
+    public $version = 8;
+
     private $images = array();
 
@@ -39 +42 @@
     public function site_settings() {
         return array(
-            /*
-             * Used to trigger the bookmarklet update notice. Needs to be set here and in
-             * get_shortcut_link() in wp-includes/link-template.php.
-             */
-            'version' => '8',
-
             /**
              * Filter whether or not Press This should redirect the user in the parent window upon save.
@@ -1324 +1321 @@
         <div class="editor-wrapper">
             <div class="alerts" role="alert" aria-live="assertive" aria-relevant="all" aria-atomic="true">
-                <p class="alert is-notice is-hidden should-upgrade-bookmarklet">
-                    <?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
-                </p>
+                <?php
+
+                if ( empty( $data['v'] ) || $this->version > $data['v'] ) {
+                    ?>
+                    <p class="alert is-notice">
+                        <?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
+                    </p>
+                    <?php
+                }
+
+                ?>
             </div>
 

trunk/src/wp-admin/js/press-this.js

@@ -367 +367 @@
                 } );
             }
-
-            // Prompt user to upgrade their bookmarklet if there is a version mismatch.
-            if ( data.v && settings.version && ( data.v + '' ) !== ( settings.version + '' ) ) {
-                $( '.should-upgrade-bookmarklet' ).removeClass( 'is-hidden' );
-            }
         }
 

trunk/src/wp-includes/link-template.php

@@ -2601 +2601 @@
     global $is_IE, $wp_version;
 
-    $bookmarklet_version = '8';
+    include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+    $bookmarklet_version = $GLOBALS['wp_press_this']->version;
     $link = '';