Changeset 12641


Ignore:
Timestamp:
11/17/11 15:41:38 (8 years ago)
Author:
patdenice
Message:

merge r12640 from trunk to branch 2.3
bug:2511
Warning messages during thumbnails creation (FTP method)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/include/functions.php

    r12555 r12641  
    859859      while (($node = readdir($contents)) !== false) 
    860860      { 
     861        if ($node == '.' or $node == '..') continue; 
     862 
    861863        if (is_file($path.'/'.$node)) 
    862864        { 
     
    885887          } 
    886888        } 
    887         else if (is_dir($path.'/'.$node) 
    888                  and $node != '.' 
    889                  and $node != '..' 
    890                  and $node != 'pwg_high' 
    891                  and $recursive) 
     889        else if (is_dir($path.'/'.$node) and $node != 'pwg_high' and $recursive) 
    892890        { 
    893891          array_push($subdirs, $node); 
Note: See TracChangeset for help on using the changeset viewer.