Merge branch '7.x-1.x' into issue_2365665

dfp.admin.inc

@@ -174,6 +174,13 @@ function dfp_admin_settings($form, $form_state) {
       ),
     ),
   );
+  $form['global_display_options']['dfp_set_centering'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Set DFP Ad Centering'),
+    '#default_value' => variable_get('dfp_set_centering', 0),
+    '#description' => t('Enables/disables centering of ads. This mode must be set before the service is enabled. Centering is disabled by default. In legacy gpt_mobile.js, centering is enabled by default.'),
+  );
+
 
   // Global targeting options.
   $form['targeting_settings'] = array(

dfp.install

@@ -129,6 +129,14 @@ function dfp_install() {
   }
 }
 
+/**
+ * Implements hook_uninstall().
+ */
+function dfp_uninstall() {
+  // Delete variables.
+  variable_del('dfp_set_centering');
+}
+
 /**
  * Migrate existing DART tags to DFP tags. Note: this migration will destroy
  * the any DFP global settings that have already been set.

dfp.module

@@ -715,6 +715,9 @@ function _dfp_js_global_settings() {
   if (variable_get('dfp_disable_init_load', 0)) {
     $js .= '  googletag.pubads().disableInitialLoad();' . "\n";
   }
+  if (variable_get('dfp_set_centering', 0)) {
+    $js .= '  googletag.pubads().setCentering(true);' . "\n";
+  }
 
   // Set global targeting values for this page.
   $targeting = variable_get('dfp_targeting', array());

tests/dfp.test

@@ -155,7 +155,8 @@ class dfpDisplayTagTest extends dfpBaseTest {
     variable_set('dfp_click_url', 'javascript://example.com?foo&bar');
     $this->drupalGet('/');
     $this->assertNoRaw('javascript://example.com');
-    $this->assertRaw('.setClickUrl("http://drupal7.dev/javascript%3A//example.com%3Ffoo%26bar")', 'Click URL is filtered for bad protocols and absolute.');
+    $pattern = '|.setClickUrl\("http(.*):\/\/(.*)javascript%3A\/\/example.com%3Ffoo%26bar"\)|';
+    $this->assertPattern($pattern, 'Click URL is filtered for bad protocols and absolute.');
 
     variable_set('dfp_click_url', 'http://example.com?foo&bar');
     $this->drupalGet('/');