| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | /** |
| 3 | 3 | * Plugin Name: Taboola |
| 4 | 4 | * Plugin URI: https://developers.taboola.com/web-integrations/discuss |
| 5 | 5 | * Description: Taboola |
| 6 | - * Version: 1.0.12 | |
| 6 | + * Version: 1.0.15 | |
| 7 | 7 | * Author: Taboola |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | 10 | define ("XPATH_MARKER","/"); |
| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | define ("JS_MARKER","{"); |
| 13 | 13 | define ("TABOOLA_CONTENT_FORMAT_STRING",'string'); |
| 14 | 14 | define ("TABOOLA_CONTENT_FORMAT_SCRIPT",'script'); |
| 15 | 15 | define ("TABOOLA_CONTENT_FORMAT_HTML",'html'); |
| 16 | -define ("TABOOLA_PLUGIN_VERSION","1.0.12"); | |
| 16 | +define ("TABOOLA_PLUGIN_VERSION","1.0.15"); | |
| 17 | 17 | |
| 18 | 18 | |
| 19 | 19 | include_once('widget.php'); |
| 20 | 20 | require_once('JavaScriptWrapper.php'); |
| @@ -57,9 +57,9 @@ | ||
| 57 | 57 | } |
| 58 | 58 | ); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled; | |
| 61 | + //$this->should_place_tag_outside_of_content = $this->settings->out_of_content_enabled; | |
| 62 | 62 | |
| 63 | 63 | if (is_admin()) { |
| 64 | 64 | //add menu for plugin |
| 65 | 65 | add_action( 'admin_menu', array(&$this, 'admin_generate_menu') ); |
| @@ -127,9 +127,11 @@ | ||
| 127 | 127 | $stringParams = array( |
| 128 | 128 | '{{PUBLISHER_ID}}' => $this->settings->publisher_id, |
| 129 | 129 | '{{PAGE_TYPE}}' => $this->get_page_type(), |
| 130 | 130 | '{{WORDPRESS_VERSION}}' => get_bloginfo('version'), |
| 131 | - '{{PLUGIN_VERSION}}' => TABOOLA_PLUGIN_VERSION | |
| 131 | + '{{PHP_VERSION}}' => phpversion(), | |
| 132 | + '{{PLUGIN_VERSION}}' => TABOOLA_PLUGIN_VERSION, | |
| 133 | + '{{LOCATION}}' => $this->settings->location_string | |
| 132 | 134 | ); |
| 133 | 135 | |
| 134 | 136 | $scriptWrapper = new JavaScriptWrapper("loaderInjectionScript.js",$stringParams); |
| 135 | 137 | $head_string = $scriptWrapper->getScripMarkupString(); |
| @@ -253,9 +255,9 @@ | ||
| 253 | 255 | } |
| 254 | 256 | } |
| 255 | 257 | |
| 256 | 258 | // tag is placed outside of content in order to allow "read more" functionality. |
| 257 | - }elseif ($this->should_place_tag_outside_of_content){ | |
| 259 | + }elseif ($this->settings->out_of_content_enabled){ | |
| 258 | 260 | |
| 259 | 261 | $scriptWrapper = new JavaScriptWrapper("js_inject.min.js",array( |
| 260 | 262 | "{{HTML}}" => $this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_HTML), |
| 261 | 263 | "{{SCRIPT}}" => $this->format_taboola_content($taboola_content,TABOOLA_CONTENT_FORMAT_SCRIPT)) |