[Pkg-owncloud-commits] [php-sabre-vobject] 30/43: Tnx @staabm

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 4.0.0-alpha2
in repository php-sabre-vobject.

commit 8815afcf7cec4c16779c17ef8d13e1a70ebbd3ee
Author: Evert Pot <me at evertpot.com>
Date:   Tue Aug 4 13:12:40 2015 -0400

    Tnx @staabm
---
 bin/mergeduplicates.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bin/mergeduplicates.php b/bin/mergeduplicates.php
index f98ec22..55175e4 100755
--- a/bin/mergeduplicates.php
+++ b/bin/mergeduplicates.php
@@ -100,8 +100,6 @@ while($vcard = $splitter->getNext()) {
 
     }
 
-    $fn = (string)$vcard->FN;
-
     if (!isset($collectedNames[$fn])) {
 
         $collectedNames[$fn] = $vcard;
@@ -134,7 +132,6 @@ while($vcard = $splitter->getNext()) {
                     // We're going to make another attempt to find this
                     // property, this time just by value. If we find it, we
                     // consider it a success.
-                    $ok = false;
                     foreach($collectedNames[$fn]->select($newProp->name) as $compareProp) {
 
                         if ($compareProp->getValue() === $newProp->getValue()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git