WPtouch - Version 4.1.2

Version Description

Download this release

Release Info

Developer bravenewcode
Plugin Icon 128x128 WPtouch
Version 4.1.2
Comparing to
See all releases

Code changes from version 4.1.1 to 4.1.2

Files changed (17) hide show
  1. admin/css/wptouch-admin-4.css +10 -4
  2. admin/customizer/wptouch-customizer-switch.js +1 -1
  3. admin/js/wptouch-ajax.js +2 -2
  4. admin/settings/html/no-setting-warning.php +7 -0
  5. core/class-wptouch-pro.php +7 -0
  6. lang/wptouch-pro-ar.mo +0 -0
  7. lang/wptouch-pro-fr_FR.mo +0 -0
  8. lang/wptouch-pro-id_ID.mo +0 -0
  9. lang/wptouch-pro-ja_JP.mo +0 -0
  10. lang/wptouch-pro-pt.mo +0 -0
  11. lang/wptouch.pot +35 -35
  12. readme.txt +9 -1
  13. themes/bauhaus/default/sharing.php +1 -1
  14. themes/bauhaus/readme.txt +5 -1
  15. themes/bauhaus/root-functions.php +1 -1
  16. themes/foundation/modules/base/wptouch-preview.js +3 -1
  17. wptouch.php +17 -5
admin/css/wptouch-admin-4.css CHANGED
@@ -217,6 +217,16 @@ a#preview-theme {
217
  display: none;
218
  }
219
 
 
 
 
 
 
 
 
 
 
 
220
  /* @end */
221
 
222
  /* @group Sections */
@@ -588,10 +598,6 @@ i.wptouch-tooltip:after {
588
  }
589
 
590
 
591
-
592
-
593
-
594
-
595
  /* :not(:required) hides this rule from IE9 and below */
596
  .wpt-spinner:not(:required) {
597
  -moz-animation: three-quarters-loader 1500ms infinite linear;
217
  display: none;
218
  }
219
 
220
+ #wptouch-settings-area .wptouch-setting.setting-no-setting-warning {
221
+ text-align: center;
222
+ }
223
+ #wptouch-settings-area .wptouch-setting.setting-no-setting-warning i {
224
+ color: #af4454;
225
+ display: block;
226
+ font-size: 72px;
227
+ margin-bottom: 10px;
228
+ }
229
+
230
  /* @end */
231
 
232
  /* @group Sections */
598
  }
599
 
600
 
 
 
 
 
601
  /* :not(:required) hides this rule from IE9 and below */
602
  .wpt-spinner:not(:required) {
603
  -moz-animation: three-quarters-loader 1500ms infinite linear;
admin/customizer/wptouch-customizer-switch.js CHANGED
@@ -18,7 +18,7 @@
18
  jQuery( '#switch_to' ).click( function( e ) {
19
  e.preventDefault();
20
  e.stopImmediatePropagation();
21
- jQuery.cookie( 'wptouch_customizer_use', next, { expires: 0, path: '/' } );
22
  window.location.reload();
23
  });
24
 
18
  jQuery( '#switch_to' ).click( function( e ) {
19
  e.preventDefault();
20
  e.stopImmediatePropagation();
21
+ jQuery.cookie( 'wptouch_customizer_use', next, { expires: false, path: '/' } );
22
  window.location.reload();
23
  });
24
 
admin/js/wptouch-ajax.js CHANGED
@@ -10,7 +10,7 @@ function wptouchAdminAjaxEnableSpinner( enable ) {
10
  if ( enable ) {
11
  jQuery( '#admin-spinner' ).animate({
12
  opacity: 1
13
- }, 500);
14
  wptouchTotalAjaxEnabled = wptouchTotalAjaxEnabled + 1;
15
  } else {
16
  wptouchTotalAjaxEnabled = wptouchTotalAjaxEnabled - 1;
@@ -19,7 +19,7 @@ function wptouchAdminAjaxEnableSpinner( enable ) {
19
  if ( wptouchTotalAjaxEnabled == 0 ) {
20
  jQuery( '#admin-spinner' ).animate({
21
  opacity: 0
22
- }, 500);
23
  }
24
  }
25
 
10
  if ( enable ) {
11
  jQuery( '#admin-spinner' ).animate({
12
  opacity: 1
13
+ }, 500 );
14
  wptouchTotalAjaxEnabled = wptouchTotalAjaxEnabled + 1;
15
  } else {
16
  wptouchTotalAjaxEnabled = wptouchTotalAjaxEnabled - 1;
19
  if ( wptouchTotalAjaxEnabled == 0 ) {
20
  jQuery( '#admin-spinner' ).animate({
21
  opacity: 0
22
+ }, 500 );
23
  }
24
  }
25
 
admin/settings/html/no-setting-warning.php ADDED
@@ -0,0 +1,7 @@
 
 
 
 
 
 
 
1
+ <p>
2
+ <i class="icon icon-alert"></i>
3
+ <?php wptouch_admin_the_setting_desc(); ?>
4
+ <?php if ( wptouch_admin_setting_has_tooltip() ) { ?>
5
+ <i class="wptouch-tooltip" title="<?php wptouch_admin_the_setting_tooltip(); ?>"></i>
6
+ <?php } ?>
7
+ </p>
core/class-wptouch-pro.php CHANGED
@@ -206,6 +206,13 @@ class WPtouchProFour {
206
 
207
  if ( defined( 'WPTOUCH_IS_FREE' ) ) {
208
  add_filter( 'wptouch_settings_override_defaults', array( &$this, 'handle_free_migration' ), 10, 2 );
 
 
 
 
 
 
 
209
  }
210
 
211
  // Only check directories when admin is showing
206
 
207
  if ( defined( 'WPTOUCH_IS_FREE' ) ) {
208
  add_filter( 'wptouch_settings_override_defaults', array( &$this, 'handle_free_migration' ), 10, 2 );
209
+
210
+ // Ensure we're using free Bauhaus
211
+ $settings = $wptouch_pro->get_settings();
212
+ $settings->current_theme_name = 'bauhaus';
213
+ $settings->current_theme_location = '/plugins/' . WPTOUCH_ROOT_NAME . '/themes';
214
+ $settings->current_theme_friendly_name = 'Bauhaus';
215
+ $settings->save();
216
  }
217
 
218
  // Only check directories when admin is showing
lang/wptouch-pro-ar.mo ADDED
Binary file
lang/wptouch-pro-fr_FR.mo CHANGED
Binary file
lang/wptouch-pro-id_ID.mo CHANGED
Binary file
lang/wptouch-pro-ja_JP.mo CHANGED
Binary file
lang/wptouch-pro-pt.mo CHANGED
Binary file
lang/wptouch.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the WPtouch Mobile Plugin package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: WPtouch Mobile Plugin 4.1.1\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7
- "POT-Creation-Date: 2016-04-12 20:01:01+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -374,7 +374,7 @@ msgstr ""
374
  #: admin/pages/custom/wptouch-admin-wizard.php:179
375
  #: admin/settings/html/theme-browser-item-detail.php:52
376
  #: admin/settings/html/updates-available.php:35
377
- #: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:926
378
  msgid "Download"
379
  msgstr ""
380
 
@@ -384,7 +384,7 @@ msgstr ""
384
  #: admin/settings/html/installed_icon_sets_ajax.php:13
385
  #: admin/settings/html/installed_icon_sets_ajax.php:26
386
  #: admin/settings/html/theme-browser-item.php:12
387
- #: core/class-wptouch-pro.php:925
388
  msgid "Installed"
389
  msgstr ""
390
 
@@ -802,7 +802,7 @@ msgstr ""
802
 
803
  #: admin/pages/wptouch-admin-general-settings.php:591
804
  #: admin/settings/html/installed_icon_sets_ajax.php:4
805
- #: core/class-wptouch-pro.php:2111 core/class-wptouch-pro.php:2112
806
  #: core/config.php:54
807
  msgid "Custom Icons"
808
  msgstr ""
@@ -909,7 +909,7 @@ msgstr ""
909
  msgid "No extensions available"
910
  msgstr ""
911
 
912
- #: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:918
913
  msgid "Upload Complete!"
914
  msgstr ""
915
 
@@ -928,13 +928,13 @@ msgid ""
928
  msgstr ""
929
 
930
  #: admin/settings/html/installed_icon_sets_ajax.php:25
931
- #: core/class-wptouch-pro.php:924
932
  msgid "Installing"
933
  msgstr ""
934
 
935
  #: admin/settings/html/installed_icon_sets_ajax.php:25
936
  #: admin/settings/html/theme-browser-item-detail.php:3
937
- #: core/admin-extensions.php:363 core/class-wptouch-pro.php:923
938
  msgid "Install"
939
  msgstr ""
940
 
@@ -1146,7 +1146,7 @@ msgstr ""
1146
  msgid "Setup Wizard"
1147
  msgstr ""
1148
 
1149
- #: core/admin-menu.php:48 core/class-wptouch-pro.php:1593
1150
  msgid "Settings"
1151
  msgstr ""
1152
 
@@ -1247,131 +1247,131 @@ msgstr ""
1247
  msgid "Reset Settings"
1248
  msgstr ""
1249
 
1250
- #: core/class-wptouch-pro.php:605
1251
  msgid ""
1252
  "Automatic theme migration from wp-content/uploads/wptouch-data directory "
1253
  "failed. Please manually move these folders to wp-content/wptouch-data: %s"
1254
  msgstr ""
1255
 
1256
- #: core/class-wptouch-pro.php:624
1257
  msgid ""
1258
  "%sWPtouch: %s was recently disabled, but is still affecting your website and "
1259
  "caching pages.%s"
1260
  msgstr ""
1261
 
1262
- #: core/class-wptouch-pro.php:625
1263
  msgid ""
1264
  "%sPlease reactivate the plugin, disable page caching, then deactivate the "
1265
  "plugin again to correct this issue.%s"
1266
  msgstr ""
1267
 
1268
- #: core/class-wptouch-pro.php:626 core/class-wptouch-pro.php:635
1269
  msgid ""
1270
  "%sFixing this issue prevents cached desktop pages being served to mobile "
1271
  "devices and vice-versa.%s"
1272
  msgstr ""
1273
 
1274
- #: core/class-wptouch-pro.php:627 core/class-wptouch-pro.php:636
1275
  msgid ""
1276
  "%sOnce fixed, this message will be dismissed automatically. Until fixed, %"
1277
  "sWPtouch will not be shown%s to mobile visitors, and cannot be previewed.%s"
1278
  msgstr ""
1279
 
1280
- #: core/class-wptouch-pro.php:634
1281
  msgid "%sWPtouch: %s needs to be configured to work correctly with WPtouch.%s"
1282
  msgstr ""
1283
 
1284
- #: core/class-wptouch-pro.php:637
1285
  msgid ""
1286
  "%sTo fix the issue, follow our %sstep-by-step setup guide%s on support."
1287
  "wptouch.com%s"
1288
  msgstr ""
1289
 
1290
- #: core/class-wptouch-pro.php:649
1291
  msgid "WPtouch Repair Required"
1292
  msgstr ""
1293
 
1294
- #: core/class-wptouch-pro.php:656
1295
  msgid "Your mobile theme was either broken or missing."
1296
  msgstr ""
1297
 
1298
- #: core/class-wptouch-pro.php:657
1299
  msgid "We downloaded a fresh copy for you."
1300
  msgstr ""
1301
 
1302
- #: core/class-wptouch-pro.php:658 core/class-wptouch-pro.php:668
1303
  msgid "OK"
1304
  msgstr ""
1305
 
1306
- #: core/class-wptouch-pro.php:661
1307
  msgid ""
1308
  "We were unable to install your WPtouch Pro theme from the Cloud. %s Please "
1309
  "visit %sthis article%s for more information."
1310
  msgstr ""
1311
 
1312
- #: core/class-wptouch-pro.php:664
1313
  msgid "WPtouch Server Issue"
1314
  msgstr ""
1315
 
1316
- #: core/class-wptouch-pro.php:666
1317
  msgid ""
1318
  "Your server setup is preventing WPtouch Pro from installing from the Cloud. %"
1319
  "s Please visit %sthis article%s for more information on how to fix it."
1320
  msgstr ""
1321
 
1322
- #: core/class-wptouch-pro.php:913
1323
  msgid ""
1324
  "This will reset all WPtouch Pro settings.\n"
1325
  "Are you sure?"
1326
  msgstr ""
1327
 
1328
- #: core/class-wptouch-pro.php:914
1329
  msgid ""
1330
  "This will reset all WPtouch Pro settings and delete the wptouch-data "
1331
  "folder.\n"
1332
  "Are you sure?"
1333
  msgstr ""
1334
 
1335
- #: core/class-wptouch-pro.php:915
1336
  msgid ""
1337
  "This will reset all WPtouch Pro settings, delete the wptouch-data folder, "
1338
  "and deactivate the plugin. Are you sure?"
1339
  msgstr ""
1340
 
1341
- #: core/class-wptouch-pro.php:916
1342
  msgid "The item failed to download for this reason: %reason%"
1343
  msgstr ""
1344
 
1345
- #: core/class-wptouch-pro.php:917
1346
  msgid "You are about to reset your license information. Proceed?"
1347
  msgstr ""
1348
 
1349
- #: core/class-wptouch-pro.php:919
1350
  msgid "Upload Failed: Not a valid image."
1351
  msgstr ""
1352
 
1353
- #: core/class-wptouch-pro.php:920
1354
  msgid ""
1355
  "WPtouch is saving settings. Please do not refresh the page while saving."
1356
  msgstr ""
1357
 
1358
- #: core/class-wptouch-pro.php:921
1359
  msgid "Install Themes"
1360
  msgstr ""
1361
 
1362
- #: core/class-wptouch-pro.php:922
1363
  msgid "Install Extensions"
1364
  msgstr ""
1365
 
1366
- #: core/class-wptouch-pro.php:1630
1367
  msgid "%s Changelog"
1368
  msgstr ""
1369
 
1370
- #: core/class-wptouch-pro.php:3038
1371
  msgid "Directory Problem"
1372
  msgstr ""
1373
 
1374
- #: core/class-wptouch-pro.php:3039
1375
  msgid "One or more required directories could not be created"
1376
  msgstr ""
1377
 
2
  # This file is distributed under the same license as the WPtouch Mobile Plugin package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: WPtouch Mobile Plugin 4.1.2\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7
+ "POT-Creation-Date: 2016-05-03 19:12:27+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
374
  #: admin/pages/custom/wptouch-admin-wizard.php:179
375
  #: admin/settings/html/theme-browser-item-detail.php:52
376
  #: admin/settings/html/updates-available.php:35
377
+ #: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:933
378
  msgid "Download"
379
  msgstr ""
380
 
384
  #: admin/settings/html/installed_icon_sets_ajax.php:13
385
  #: admin/settings/html/installed_icon_sets_ajax.php:26
386
  #: admin/settings/html/theme-browser-item.php:12
387
+ #: core/class-wptouch-pro.php:932
388
  msgid "Installed"
389
  msgstr ""
390
 
802
 
803
  #: admin/pages/wptouch-admin-general-settings.php:591
804
  #: admin/settings/html/installed_icon_sets_ajax.php:4
805
+ #: core/class-wptouch-pro.php:2118 core/class-wptouch-pro.php:2119
806
  #: core/config.php:54
807
  msgid "Custom Icons"
808
  msgstr ""
909
  msgid "No extensions available"
910
  msgstr ""
911
 
912
+ #: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:925
913
  msgid "Upload Complete!"
914
  msgstr ""
915
 
928
  msgstr ""
929
 
930
  #: admin/settings/html/installed_icon_sets_ajax.php:25
931
+ #: core/class-wptouch-pro.php:931
932
  msgid "Installing"
933
  msgstr ""
934
 
935
  #: admin/settings/html/installed_icon_sets_ajax.php:25
936
  #: admin/settings/html/theme-browser-item-detail.php:3
937
+ #: core/admin-extensions.php:363 core/class-wptouch-pro.php:930
938
  msgid "Install"
939
  msgstr ""
940
 
1146
  msgid "Setup Wizard"
1147
  msgstr ""
1148
 
1149
+ #: core/admin-menu.php:48 core/class-wptouch-pro.php:1600
1150
  msgid "Settings"
1151
  msgstr ""
1152
 
1247
  msgid "Reset Settings"
1248
  msgstr ""
1249
 
1250
+ #: core/class-wptouch-pro.php:612
1251
  msgid ""
1252
  "Automatic theme migration from wp-content/uploads/wptouch-data directory "
1253
  "failed. Please manually move these folders to wp-content/wptouch-data: %s"
1254
  msgstr ""
1255
 
1256
+ #: core/class-wptouch-pro.php:631
1257
  msgid ""
1258
  "%sWPtouch: %s was recently disabled, but is still affecting your website and "
1259
  "caching pages.%s"
1260
  msgstr ""
1261
 
1262
+ #: core/class-wptouch-pro.php:632
1263
  msgid ""
1264
  "%sPlease reactivate the plugin, disable page caching, then deactivate the "
1265
  "plugin again to correct this issue.%s"
1266
  msgstr ""
1267
 
1268
+ #: core/class-wptouch-pro.php:633 core/class-wptouch-pro.php:642
1269
  msgid ""
1270
  "%sFixing this issue prevents cached desktop pages being served to mobile "
1271
  "devices and vice-versa.%s"
1272
  msgstr ""
1273
 
1274
+ #: core/class-wptouch-pro.php:634 core/class-wptouch-pro.php:643
1275
  msgid ""
1276
  "%sOnce fixed, this message will be dismissed automatically. Until fixed, %"
1277
  "sWPtouch will not be shown%s to mobile visitors, and cannot be previewed.%s"
1278
  msgstr ""
1279
 
1280
+ #: core/class-wptouch-pro.php:641
1281
  msgid "%sWPtouch: %s needs to be configured to work correctly with WPtouch.%s"
1282
  msgstr ""
1283
 
1284
+ #: core/class-wptouch-pro.php:644
1285
  msgid ""
1286
  "%sTo fix the issue, follow our %sstep-by-step setup guide%s on support."
1287
  "wptouch.com%s"
1288
  msgstr ""
1289
 
1290
+ #: core/class-wptouch-pro.php:656
1291
  msgid "WPtouch Repair Required"
1292
  msgstr ""
1293
 
1294
+ #: core/class-wptouch-pro.php:663
1295
  msgid "Your mobile theme was either broken or missing."
1296
  msgstr ""
1297
 
1298
+ #: core/class-wptouch-pro.php:664
1299
  msgid "We downloaded a fresh copy for you."
1300
  msgstr ""
1301
 
1302
+ #: core/class-wptouch-pro.php:665 core/class-wptouch-pro.php:675
1303
  msgid "OK"
1304
  msgstr ""
1305
 
1306
+ #: core/class-wptouch-pro.php:668
1307
  msgid ""
1308
  "We were unable to install your WPtouch Pro theme from the Cloud. %s Please "
1309
  "visit %sthis article%s for more information."
1310
  msgstr ""
1311
 
1312
+ #: core/class-wptouch-pro.php:671
1313
  msgid "WPtouch Server Issue"
1314
  msgstr ""
1315
 
1316
+ #: core/class-wptouch-pro.php:673
1317
  msgid ""
1318
  "Your server setup is preventing WPtouch Pro from installing from the Cloud. %"
1319
  "s Please visit %sthis article%s for more information on how to fix it."
1320
  msgstr ""
1321
 
1322
+ #: core/class-wptouch-pro.php:920
1323
  msgid ""
1324
  "This will reset all WPtouch Pro settings.\n"
1325
  "Are you sure?"
1326
  msgstr ""
1327
 
1328
+ #: core/class-wptouch-pro.php:921
1329
  msgid ""
1330
  "This will reset all WPtouch Pro settings and delete the wptouch-data "
1331
  "folder.\n"
1332
  "Are you sure?"
1333
  msgstr ""
1334
 
1335
+ #: core/class-wptouch-pro.php:922
1336
  msgid ""
1337
  "This will reset all WPtouch Pro settings, delete the wptouch-data folder, "
1338
  "and deactivate the plugin. Are you sure?"
1339
  msgstr ""
1340
 
1341
+ #: core/class-wptouch-pro.php:923
1342
  msgid "The item failed to download for this reason: %reason%"
1343
  msgstr ""
1344
 
1345
+ #: core/class-wptouch-pro.php:924
1346
  msgid "You are about to reset your license information. Proceed?"
1347
  msgstr ""
1348
 
1349
+ #: core/class-wptouch-pro.php:926
1350
  msgid "Upload Failed: Not a valid image."
1351
  msgstr ""
1352
 
1353
+ #: core/class-wptouch-pro.php:927
1354
  msgid ""
1355
  "WPtouch is saving settings. Please do not refresh the page while saving."
1356
  msgstr ""
1357
 
1358
+ #: core/class-wptouch-pro.php:928
1359
  msgid "Install Themes"
1360
  msgstr ""
1361
 
1362
+ #: core/class-wptouch-pro.php:929
1363
  msgid "Install Extensions"
1364
  msgstr ""
1365
 
1366
+ #: core/class-wptouch-pro.php:1637
1367
  msgid "%s Changelog"
1368
  msgstr ""
1369
 
1370
+ #: core/class-wptouch-pro.php:3045
1371
  msgid "Directory Problem"
1372
  msgstr ""
1373
 
1374
+ #: core/class-wptouch-pro.php:3046
1375
  msgid "One or more required directories could not be created"
1376
  msgstr ""
1377
 
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3
  Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4
  Requires at least: 4.2
5
- Stable tag: 4.1.1
6
  Tested up to: 4.5
7
  License: GPLv2
8
 
@@ -33,6 +33,14 @@ For more information visit [WPtouch.com](http://www.wptouch.com/?utm_campaign=wp
33
 
34
  == Changelog ==
35
 
 
 
 
 
 
 
 
 
36
  = Version 4.1.1 (April 12, 2016) =
37
 
38
  * Added: Compatibility with WordPress 4.5
2
  Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3
  Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4
  Requires at least: 4.2
5
+ Stable tag: 4.1.2
6
  Tested up to: 4.5
7
  License: GPLv2
8
 
33
 
34
  == Changelog ==
35
 
36
+ = Version 4.1.2 (May 3, 2016) =
37
+
38
+ * Fixed: Auto-disable free plugin when WPtouch Pro is active
39
+ * Fixed: Ensure correct theme is active when downgrading from WPtouch Pro
40
+ * Fixed: Pinterest sharing link
41
+ * Fixed: Search forms now allow searching while in preview mode
42
+ * Updated: Translations for Arabic, French, Indonesian, Japanese, Portuguese
43
+
44
  = Version 4.1.1 (April 12, 2016) =
45
 
46
  * Added: Compatibility with WordPress 4.5
themes/bauhaus/default/sharing.php CHANGED
@@ -1,6 +1,6 @@
1
  <div class="<?php foundation_sharing_classes(); ?>">
2
  <a class="facebook-btn no-ajax" href="//www.facebook.com/sharer.php?u=<?php echo urlencode( get_permalink() ); ?>" target="_blank"><?php _e( 'Share', 'wptouch-pro' ); ?></a>
3
  <a class="twitter-btn no-ajax" href="//twitter.com/intent/tweet?source=wptouchpro3&text=<?php echo htmlspecialchars( urlencode( html_entity_decode( get_the_title() . ' - ' ) ) ); ?>&url=<?php echo urlencode( get_permalink() ); ?>" target="_blank"><?php _e( 'Tweet', 'wptouch-pro' ); ?></a>
4
- <a class="pinterest-btn no-ajax" href="//pinterest.com/pin/create/button/?url=<?php echo urlencode( get_permalink() ); ?>" target="_blank"><?php _e( 'Pin', 'wptouch-pro' ); ?></a>
5
  <a class="email-btn no-ajax" href="mailto:?subject=<?php echo rawurlencode( get_the_title() ); ?>&body=<?php echo rawurlencode( get_permalink() ); ?>"><?php _e( 'Mail', 'wptouch-pro' ); ?></a>
6
  </div>
1
  <div class="<?php foundation_sharing_classes(); ?>">
2
  <a class="facebook-btn no-ajax" href="//www.facebook.com/sharer.php?u=<?php echo urlencode( get_permalink() ); ?>" target="_blank"><?php _e( 'Share', 'wptouch-pro' ); ?></a>
3
  <a class="twitter-btn no-ajax" href="//twitter.com/intent/tweet?source=wptouchpro3&text=<?php echo htmlspecialchars( urlencode( html_entity_decode( get_the_title() . ' - ' ) ) ); ?>&url=<?php echo urlencode( get_permalink() ); ?>" target="_blank"><?php _e( 'Tweet', 'wptouch-pro' ); ?></a>
4
+ <a class="pinterest-btn no-ajax" href="//pinterest.com/pin/create/button/?url=<?php echo urlencode( get_permalink() ); ?>&media=<?php echo wp_get_attachment_url( get_post_thumbnail_id($post->ID) ); ?>" target="_blank"><?php _e( 'Pin', 'wptouch-pro' ); ?></a>
5
  <a class="email-btn no-ajax" href="mailto:?subject=<?php echo rawurlencode( get_the_title() ); ?>&body=<?php echo rawurlencode( get_permalink() ); ?>"><?php _e( 'Mail', 'wptouch-pro' ); ?></a>
6
  </div>
themes/bauhaus/readme.txt CHANGED
@@ -2,7 +2,7 @@ Theme Name: Bauhaus
2
  Theme URI: http://www.wptouch.com/themes/bauhaus
3
  Author: BraveNewCode Inc.
4
  Description: Clean, modern, functional design. Great for all types of WordPress sites.
5
- Version: 1.6.5
6
  Depends on: 4.0
7
  Framework: 2.0
8
  Tags: smartphone
@@ -23,6 +23,10 @@ Bauhaus is one of our more flexible themes, and is designed to easily take on th
23
 
24
  == Changelog ==
25
 
 
 
 
 
26
  = Version 1.6.5 =
27
 
28
  * Added: New menu position setting to control which side the menu is on (and consequently the search icon flips over as well)
2
  Theme URI: http://www.wptouch.com/themes/bauhaus
3
  Author: BraveNewCode Inc.
4
  Description: Clean, modern, functional design. Great for all types of WordPress sites.
5
+ Version: 1.6.6
6
  Depends on: 4.0
7
  Framework: 2.0
8
  Tags: smartphone
23
 
24
  == Changelog ==
25
 
26
+ = Version 1.6.6 =
27
+
28
+ * Fixed: Pinterest sharing (Added image URL)
29
+
30
  = Version 1.6.5 =
31
 
32
  * Added: New menu position setting to control which side the menu is on (and consequently the search icon flips over as well)
themes/bauhaus/root-functions.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
 
3
- define( 'BAUHAUS_THEME_VERSION', '1.6.5' );
4
  define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5
  define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6
  define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );
1
  <?php
2
 
3
+ define( 'BAUHAUS_THEME_VERSION', '1.6.6' );
4
  define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5
  define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6
  define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );
themes/foundation/modules/base/wptouch-preview.js CHANGED
@@ -1,7 +1,9 @@
1
  function wptouchDoPreview() {
 
 
2
  jQuery( 'a:not(.load-more-link)' ).each( function() {
3
  var linkLocation = jQuery( this ).attr( 'href' );
4
- if ( linkLocation ) {
5
  if ( linkLocation.search( "\\?" ) == -1 ) {
6
  linkLocation = linkLocation + '?wptouch_preview_theme=enabled';
7
  } else {
1
  function wptouchDoPreview() {
2
+ jQuery( '#searchform' ).prepend( '<input type="hidden" name="wptouch_preview_theme" value="enabled">' );
3
+
4
  jQuery( 'a:not(.load-more-link)' ).each( function() {
5
  var linkLocation = jQuery( this ).attr( 'href' );
6
+ if ( linkLocation && linkLocation.charAt( 0 ) != '#' ) {
7
  if ( linkLocation.search( "\\?" ) == -1 ) {
8
  linkLocation = linkLocation + '?wptouch_preview_theme=enabled';
9
  } else {
wptouch.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  Plugin Name: WPtouch Mobile Plugin
4
  Plugin URI: http://www.wptouch.com/
5
- Version: 4.1.1
6
  Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7
  Author: BraveNewCode Inc.
8
  Author URI: http://www.bravenewcode.com/
@@ -14,7 +14,7 @@
14
 
15
  function wptouch_create_four_object() {
16
  if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17
- define( 'WPTOUCH_VERSION', '4.1.1' );
18
 
19
  define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20
  define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );
@@ -53,8 +53,18 @@ function wptouch_create_four_object() {
53
  }
54
  }
55
 
 
 
 
 
 
 
 
 
 
56
  function wptouch_disable_self() {
57
- if ( defined( 'WPTOUCH_IS_PRO' ) ) {
 
58
  deactivate_plugins( plugin_basename( __FILE__ ) );
59
  }
60
  }
@@ -115,6 +125,8 @@ function wptouch_bauhaus_pro( $name ) {
115
  return $name;
116
  }
117
 
118
- function wptouch_is_update_available() {
119
- return false;
 
 
120
  }
2
  /*
3
  Plugin Name: WPtouch Mobile Plugin
4
  Plugin URI: http://www.wptouch.com/
5
+ Version: 4.1.2
6
  Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7
  Author: BraveNewCode Inc.
8
  Author URI: http://www.bravenewcode.com/
14
 
15
  function wptouch_create_four_object() {
16
  if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17
+ define( 'WPTOUCH_VERSION', '4.1.2' );
18
 
19
  define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20
  define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );
53
  }
54
  }
55
 
56
+ function is_wptouch_pro_active() {
57
+ $active_plugins = get_option( 'active_plugins', array() );
58
+ if ( in_array( 'wptouch-pro/wptouch-pro.php', $active_plugins ) ) {
59
+ return true;
60
+ }
61
+
62
+ return false;
63
+ }
64
+
65
  function wptouch_disable_self() {
66
+ if ( is_wptouch_pro_active() ) {
67
+ var_dump( 'hai' );
68
  deactivate_plugins( plugin_basename( __FILE__ ) );
69
  }
70
  }
125
  return $name;
126
  }
127
 
128
+ if ( !is_wptouch_pro_active() ) {
129
+ function wptouch_is_update_available() {
130
+ return false;
131
+ }
132
  }