Changeset 1646821 for wptouch

Timestamp:

04/27/2017 05:47:37 PM (9 years ago)

Author:

wptouch

Message:

4.3.16 code updates.

Location:

wptouch/trunk

Files:

• core/class-wptouch-pro.php (modified) (2 diffs)
• include/js/wptouch.js (modified) (1 diff)
• include/js/wptouch.min.js (modified) (1 diff)
• lang/wptouch.pot (modified) (21 diffs)
• readme.txt (modified) (2 diffs)
• wptouch.php (modified) (2 diffs)

wptouch/trunk/core/class-wptouch-pro.php

@@ -419 +419 @@
                             $should_regenerate = false;
 
-                            $content = $shortcode_data->shortcode_content;
+                            /**
+                             * Handle backslash fix that occurs.
+                             *
+                             * @see https://github.com/sureswiftcapital/wptouch-pro/pull/36
+                             */
+                            $content = str_replace( '_BACKSLASH_', '\\', $shortcode_data->shortcode_content );
                         } else {
                             // Shortcode is not valid
@@ -541 +546 @@
 
                 $page_shortcode_data->valid_until = time() + 3600*24;
-                $page_shortcode_data->shortcode_content = $content;
+
+                /**
+                 * Replace backslashes in code before saving. Should be re-replaced on output.
+                 *
+                 * @see https://github.com/sureswiftcapital/wptouch-pro/pull/36
+                 */
+                $page_shortcode_data->shortcode_content = str_replace( '\\', '_BACKSLASH_', $content );
 
                 $shortcode_data[ 'page-' . $page ] = $page_shortcode_data;

wptouch/trunk/include/js/wptouch.js

@@ -44 +44 @@
         };
 
-        console.log( params );
-
         jQuery.post( wptouchMain.current_shortcode_url + '&current_time=' + jQuery.now(), params, function( result ) {
                 shortcodeDiv.html( result );

wptouch/trunk/include/js/wptouch.min.js

@@ -1 @@
-function WPtouchAjax(t,e,n){var o={action:"wptouch_client_ajax",wptouch_action:t,wptouch_nonce:wptouchMain.security_nonce};for(name in e)o[name]=e[name];jQuery.post(wptouchMain.ajaxurl,o,function(t){n(t)})}function doWPtouchReady(){wptouchMain.query_vars=jQuery.parseJSON(wptouchMain.query_vars);var t=jQuery(".wptouch-sc-content");if(t.length){var e={post_id:t.attr("data-post-id"),page:t.attr("data-page"),post_content:jQuery(".wptouch-orig-content").html(),post_nonce:wptouchMain.security_nonce};console.log(e),jQuery.post(wptouchMain.current_shortcode_url+"&current_time="+jQuery.now(),e,function(e){t.html(e),jQuery(document).trigger("wptouch_ajax_content_loaded")})}}jQuery("#content table").each(function(){parentElement=jQuery(this).parent("p,div"),parentElement.hasClass("post")===!1?parentElement.addClass("table-parent"):jQuery(this).wrap('<div class="table-parent"></div>')}),jQuery("#footer .back-to-top").click(function(t){t.preventDefault(),jQuery(window).scrollTop(0)}),jQuery(document).ready(function(){doWPtouchReady()});
+function WPtouchAjax(t,e,n){var o={action:"wptouch_client_ajax",wptouch_action:t,wptouch_nonce:wptouchMain.security_nonce};for(name in e)o[name]=e[name];jQuery.post(wptouchMain.ajaxurl,o,function(t){n(t)})}function doWPtouchReady(){wptouchMain.query_vars=jQuery.parseJSON(wptouchMain.query_vars);var t=jQuery(".wptouch-sc-content");if(t.length){var e={post_id:t.attr("data-post-id"),page:t.attr("data-page"),post_content:jQuery(".wptouch-orig-content").html(),post_nonce:wptouchMain.security_nonce};jQuery.post(wptouchMain.current_shortcode_url+"&current_time="+jQuery.now(),e,function(e){t.html(e),jQuery(document).trigger("wptouch_ajax_content_loaded")})}}jQuery("#content table").each(function(){parentElement=jQuery(this).parent("p,div"),parentElement.hasClass("post")===!1?parentElement.addClass("table-parent"):jQuery(this).wrap('<div class="table-parent"></div>')}),jQuery("#footer .back-to-top").click(function(t){t.preventDefault(),jQuery(window).scrollTop(0)}),jQuery(document).ready(function(){doWPtouchReady()});

wptouch/trunk/lang/wptouch.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: WPtouch Mobile Plugin 4.3.15\n"
+"Project-Id-Version: WPtouch Mobile Plugin 4.3.16\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
-"POT-Creation-Date: 2017-04-10 20:36:32+00:00\n"
+"POT-Creation-Date: 2017-04-27 17:45:36+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -378 +378 @@
 #: admin/settings/html/theme-browser-item-detail.php:52
 #: admin/settings/html/updates-available.php:35
-#: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:975
+#: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:986
 msgid "Download"
 msgstr ""
@@ -388 +388 @@
 #: admin/settings/html/installed_icon_sets_ajax.php:26
 #: admin/settings/html/theme-browser-item.php:12
-#: core/class-wptouch-pro.php:974
+#: core/class-wptouch-pro.php:985
 msgid "Installed"
 msgstr ""
@@ -806 +806 @@
 #: admin/pages/wptouch-admin-general-settings.php:593
 #: admin/settings/html/installed_icon_sets_ajax.php:4
-#: core/class-wptouch-pro.php:2170 core/class-wptouch-pro.php:2171
+#: core/class-wptouch-pro.php:2181 core/class-wptouch-pro.php:2182
 #: core/config.php:54
 msgid "Custom Icons"
@@ -923 +923 @@
 msgstr ""
 
-#: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:967
+#: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:978
 msgid "Upload Complete!"
 msgstr ""
@@ -942 +942 @@
 
 #: admin/settings/html/installed_icon_sets_ajax.php:25
-#: core/class-wptouch-pro.php:973
+#: core/class-wptouch-pro.php:984
 msgid "Installing"
 msgstr ""
@@ -948 +948 @@
 #: admin/settings/html/installed_icon_sets_ajax.php:25
 #: admin/settings/html/theme-browser-item-detail.php:3
-#: core/admin-extensions.php:365 core/class-wptouch-pro.php:972
+#: core/admin-extensions.php:365 core/class-wptouch-pro.php:983
 msgid "Install"
 msgstr ""
@@ -1160 +1160 @@
 msgstr ""
 
-#: core/admin-menu.php:49 core/class-wptouch-pro.php:1642
+#: core/admin-menu.php:49 core/class-wptouch-pro.php:1653
 msgid "Settings"
 msgstr ""
@@ -1257 +1257 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:652
+#: core/class-wptouch-pro.php:663
 msgid ""
 "Automatic theme migration from wp-content/uploads/wptouch-data directory "
@@ -1263 +1263 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:671
+#: core/class-wptouch-pro.php:682
 msgid ""
 "%sWPtouch: %s was recently disabled, but is still affecting your website and "
@@ -1269 +1269 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:672
+#: core/class-wptouch-pro.php:683
 msgid ""
 "%sPlease reactivate the plugin, disable page caching, then deactivate the "
@@ -1275 +1275 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:673 core/class-wptouch-pro.php:682
+#: core/class-wptouch-pro.php:684 core/class-wptouch-pro.php:693
 msgid ""
 "%sFixing this issue prevents cached desktop pages being served to mobile "
@@ -1281 +1281 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:674 core/class-wptouch-pro.php:683
+#: core/class-wptouch-pro.php:685 core/class-wptouch-pro.php:694
 msgid ""
 "%sOnce fixed, this message will be dismissed automatically. Until fixed, "
@@ -1287 +1287 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:681
+#: core/class-wptouch-pro.php:692
 msgid "%sWPtouch: %s needs to be configured to work correctly with WPtouch.%s"
 msgstr ""
 
-#: core/class-wptouch-pro.php:684
+#: core/class-wptouch-pro.php:695
 msgid ""
 "%sTo fix the issue, follow our %sstep-by-step setup guide%s on support."
@@ -1297 +1297 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:696
+#: core/class-wptouch-pro.php:707
 msgid "WPtouch Repair Required"
 msgstr ""
 
-#: core/class-wptouch-pro.php:703
+#: core/class-wptouch-pro.php:714
 msgid "Your mobile theme was either broken or missing."
 msgstr ""
 
-#: core/class-wptouch-pro.php:704
+#: core/class-wptouch-pro.php:715
 msgid "We downloaded a fresh copy for you."
 msgstr ""
 
-#: core/class-wptouch-pro.php:705 core/class-wptouch-pro.php:715
+#: core/class-wptouch-pro.php:716 core/class-wptouch-pro.php:726
 msgid "OK"
 msgstr ""
 
-#: core/class-wptouch-pro.php:708
+#: core/class-wptouch-pro.php:719
 msgid ""
 "We were unable to install your WPtouch Pro theme from the Cloud. %s Please "
@@ -1319 +1319 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:711
+#: core/class-wptouch-pro.php:722
 msgid "WPtouch Server Issue"
 msgstr ""
 
-#: core/class-wptouch-pro.php:713
+#: core/class-wptouch-pro.php:724
 msgid ""
 "Your server setup is preventing WPtouch Pro from installing from the Cloud. "
@@ -1329 +1329 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:962
+#: core/class-wptouch-pro.php:973
 msgid ""
 "This will reset all WPtouch Pro settings.\n"
@@ -1335 +1335 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:963
+#: core/class-wptouch-pro.php:974
 msgid ""
 "This will reset all WPtouch Pro settings and delete the wptouch-data "
@@ -1342 +1342 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:964
+#: core/class-wptouch-pro.php:975
 msgid ""
 "This will reset all WPtouch Pro settings, delete the wptouch-data folder, "
@@ -1348 +1348 @@
 msgstr ""
 
-#: core/class-wptouch-pro.php:965
+#: core/class-wptouch-pro.php:976
 msgid "The item failed to download for this reason: %reason%"
 msgstr ""
 
-#: core/class-wptouch-pro.php:966
+#: core/class-wptouch-pro.php:977
 msgid "You are about to reset your license information. Proceed?"
 msgstr ""
 
-#: core/class-wptouch-pro.php:968
+#: core/class-wptouch-pro.php:979
 msgid "Upload Failed: Not a valid image."
 msgstr ""
 
-#: core/class-wptouch-pro.php:969
+#: core/class-wptouch-pro.php:980
 msgid ""
 "WPtouch is saving settings. Please do not refresh the page while saving."
 msgstr ""
 
-#: core/class-wptouch-pro.php:970
+#: core/class-wptouch-pro.php:981
 msgid "Install Themes"
 msgstr ""
 
-#: core/class-wptouch-pro.php:971
+#: core/class-wptouch-pro.php:982
 msgid "Install Extensions"
 msgstr ""
 
-#: core/class-wptouch-pro.php:1679
+#: core/class-wptouch-pro.php:1690
 msgid "%s Changelog"
 msgstr ""
 
-#: core/class-wptouch-pro.php:3096
+#: core/class-wptouch-pro.php:3107
 msgid "Directory Problem"
 msgstr ""
 
-#: core/class-wptouch-pro.php:3097
+#: core/class-wptouch-pro.php:3108
 msgid "One or more required directories could not be created"
 msgstr ""
@@ -2511 +2511 @@
 msgstr ""
 
-#. #-#-#-#-#  wptouch.pot (WPtouch Mobile Plugin 4.3.15)  #-#-#-#-#
+#. #-#-#-#-#  wptouch.pot (WPtouch Mobile Plugin 4.3.16)  #-#-#-#-#
 #. Plugin URI of the plugin/theme
-#. #-#-#-#-#  wptouch.pot (WPtouch Mobile Plugin 4.3.15)  #-#-#-#-#
+#. #-#-#-#-#  wptouch.pot (WPtouch Mobile Plugin 4.3.16)  #-#-#-#-#
 #. Author URI of the plugin/theme
 msgid "http://www.wptouch.com/"

wptouch/trunk/readme.txt

@@ -3 +3 @@
 Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
 Requires at least: 4.2
-Stable tag: 4.3.15
+Stable tag: 4.3.16
 Tested up to: 4.7
 License: GPLv2
@@ -33 +33 @@
 
 == Changelog ==
+
+= Version 4.3.16 (April 25, 2017) =
+
+* Fixed: Bug where backslashes were being stripped from shortcode display.
 
 = Version 4.3.15 (April 10, 2017) =

wptouch/trunk/wptouch.php

@@ -3 +3 @@
     Plugin Name: WPtouch Mobile Plugin
     Plugin URI: http://www.wptouch.com/
-    Version: 4.3.15
+    Version: 4.3.16
     Description: Make a beautiful mobile-friendly version of your website with just a few clicks.
     Author: WPtouch
@@ -15 +15 @@
 function wptouch_create_four_object() {
     if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
-        define( 'WPTOUCH_VERSION', '4.3.15' );
+        define( 'WPTOUCH_VERSION', '4.3.16' );
 
         define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );