Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dennis 7.x 1.x #1

Open
wants to merge 24 commits into
base: 7.x-1.x
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
725e7dd
#2349001; implemented hook_uninstall
marcelovani Mar 3, 2017
7cd2e36
#2383341; Applied patch
marcelovani Mar 3, 2017
c317a24
#2383919; Applied patch
marcelovani Mar 3, 2017
7e94486
Merge branch '7.x-1.x' into Issue_2383919
marcelovani Mar 3, 2017
fd9e95e
Merge branch '7.x-1.x' into issue_2383341
marcelovani Mar 3, 2017
4eec610
Merge branch '7.x-1.x' into issue_2349001
marcelovani Mar 3, 2017
e72cdee
Merge branch 'issue_2383919' into issue_2383341
marcelovani Mar 3, 2017
304c05b
Merge branch 'issue_2383341' into dennis-7.x-1.x
marcelovani Mar 3, 2017
69cedfa
Merge branch '7.x-1.x' into dennis-7.x-1.x
marcelovani Mar 6, 2017
5d0a987
Merge branch '7.x-1.x' into issue_2383919
marcelovani Mar 6, 2017
63b2fd5
Re-rolled patch
marcelovani Mar 6, 2017
0d95b85
Merge branch '7.x-1.x' into issue_2383341
marcelovani Mar 17, 2017
b0abcf1
Merge branch '7.x-1.x' into issue_2383919
marcelovani Mar 17, 2017
becc4d6
Merge branch '7.x-1.x' into issue_2383341
marcelovani Apr 4, 2017
e489dfc
Merge branch 'issue_2383341' of github.com:marcelovani/dfp into issue…
marcelovani Apr 4, 2017
f7472ff
Merge branch 'issue_2383919' of github.com:marcelovani/dfp into issue…
marcelovani Apr 4, 2017
21119b0
Merge branch 'issue_2383919' of github.com:marcelovani/dfp into issue…
marcelovani Apr 4, 2017
9900cd5
Merge branch '7.x-1.x' into dennis-7.x-1.x
marcelovani Apr 4, 2017
107c841
Merge branch '7.x-1.x' into dennis-7.x-1.x
marcelovani Apr 4, 2017
8841df8
Merge branch '7.x-1.x' into issue_2383341
marcelovani Apr 4, 2017
b9f8ed6
Removed wrong merge
marcelovani Apr 4, 2017
0c2c173
Merge branch 'issue_2383341' into dennis-7.x-1.x
marcelovani Apr 4, 2017
09a7063
Merge branch '7.x-1.x' into issue_2383919
marcelovani Apr 4, 2017
9f831d5
Merge branch 'issue_2383919' into dennis-7.x-1.x
marcelovani Apr 4, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dfp.module
Original file line number Diff line number Diff line change
Expand Up @@ -554,15 +554,15 @@ function dfp_format_targeting($targeting, $tag = '') {
$target['target'] = '"' . check_plain($target['target']) . '"';
$target['value'] = dfp_token_replace(check_plain($target['value']), $tag, array('sanitize' => TRUE, 'clear' => TRUE));

// Allow other modules to alter the target.
drupal_alter('dfp_target', $target);

// The target value could be blank if tokens are used. If so, removed it.
if (empty($target['value'])) {
unset($targeting[$key]);
continue;
}

// Allow other modules to alter the target.
drupal_alter('dfp_target', $target);

// Convert the values into an array and trim the whitespace from each value.
$values = explode(',', $target['value']);
$values = array_map('trim', $values);
Expand Down