Merge lp:~gesha/linaro-license-protection/989556 into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Georgy Redkozubov
Status: Merged
Merged at revision: 66
Proposed branch: lp:~gesha/linaro-license-protection/989556
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
licenses/license.php (+1/-1)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/989556
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
James Tunnicliffe Pending
Review via email: mp+104366@code.launchpad.net

Description of the change

Add missing '/' when checking if entry is a directory.

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'licenses/license.php'
--- licenses/license.php 2012-04-25 16:31:06 +0000
+++ licenses/license.php 2012-05-02 11:26:17 +0000
@@ -14,7 +14,7 @@
14 $files = array(); 14 $files = array();
15 if ($handle = opendir($dirname)) {15 if ($handle = opendir($dirname)) {
16 while ($handle && false !== ($entry = readdir($handle))) {16 while ($handle && false !== ($entry = readdir($handle))) {
17 if ($entry != "." && $entry != ".." && !is_dir($dirname.$entry) && $entry != "HEADER.html") {17 if ($entry != "." && $entry != ".." && !is_dir($dirname."/".$entry) && $entry != "HEADER.html") {
18 $files[] = $entry;18 $files[] = $entry;
19 }19 }
20 }20 }

Subscribers

People subscribed via source and target branches