Merge pull request #16 from getshifter/subdir_hb

Subdir hb

Author: sawanoboly

admin/class-shifter-admin.php

@@ -115,10 +115,11 @@ public function shifter_heartbert_on_sitepreview_write_script() {
 		<script>
 		function shifter_heartbert_getajax() {
 			var xhr= new XMLHttpRequest();
-			xhr.open("GET","/wp-admin/admin-ajax.php?action=nopriv_heartbeat");
+			xhr.open("GET","<?php echo esc_url(add_query_arg('action','nopriv_heartbeat',site_url('/wp-admin/admin-ajax.php')));?>");
 			xhr.send();
 		}
-		setInterval("shifter_heartbert_getajax()", 30000);
+		var shifterHB = setInterval("shifter_heartbert_getajax()", 30000);
+		setTimeout(function(){clearInterval(shifterHB)}, 1500000);
 		</script>
 			<?php
 		}

includes/class-shifter.php

@@ -176,6 +176,7 @@ private function define_admin_hooks() {
 
 		// Shifter Heartbeat.
 		$this->loader->add_action( 'wp_footer', $plugin_admin, 'shifter_heartbert_on_sitepreview_write_script', 999 );
+		$this->loader->add_action( 'admin_footer', $plugin_admin, 'shifter_heartbert_on_sitepreview_write_script', 999 );
 
 		// Shifter Mail From Helper.
 		$this->loader->add_filter( 'wp_mail_from', $plugin_admin, 'shifter_mail_from' );

shifter.php

@@ -15,7 +15,7 @@
  * Plugin Name:       Shifter
  * Plugin URI:        https://github.com/getshifter/shifter-wp-mu
  * Description:       Helper functions for WordPress sites on Shifter.
- * Version:           1.0.10
+ * Version:           1.0.12
  * Author:            DigitalCube
  * Author URI:        https://www.getshifter.io
  * License:           GPL-2.0+