Changeset 12643


Ignore:
Timestamp:
Nov 17, 2011, 7:10:51 PM (9 years ago)
Author:
patdenice
Message:

merge r12642 from trunk to branch 2.3
bug:2513
Warning messages during synchronisation on some servers

Location:
branches/2.3/admin
Files:
2 edited

Legend:

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

    r12641 r12643  
    534534      while (($node = readdir($contents)) !== false)
    535535      {
    536         if (is_dir($path.'/'.$node)
    537             and $node != '.'
     536        if ($node != '.'
    538537            and $node != '..'
    539538            and $node != '.svn'
    540539            and $node != 'thumbnail'
    541540            and $node != 'pwg_high'
    542             and $node != 'pwg_representative')
     541            and $node != 'pwg_representative'
     542            and is_dir($path.'/'.$node))
    543543        {
    544544          array_push($dirs, $path.'/'.$node);
  • branches/2.3/admin/site_reader_local.php

    r10157 r12643  
    8585    while (($node = readdir($contents)) !== false)
    8686    {
     87      if ($node == '.' or $node == '..') continue;
     88
    8789      if (is_file($path.'/'.$node))
    8890      {
     
    99101      }
    100102      elseif (is_dir($path.'/'.$node)
    101                and $node != '.'
    102                and $node != '..'
    103103               and $node != 'pwg_high'
    104104               and $node != 'pwg_representative'
Note: See TracChangeset for help on using the changeset viewer.