Merge branch 'stable-3.0.5'

Marius Cramer

2014-10-24 5ec4395f0e23bf11b3edef5c745e8f38c73ce637

 interface/web/tools/resync_do.php

@@ -66,7 +66,10 @@
               $tmp_id .= $server['server_id'].',';
               $server_name[$server['server_id']] = $server['server_name'];
            }
         } else {
            $server_name[$server_id] = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id)['server_name'];
         }
				
         if ( isset($tmp_id) ) $server_id = rtrim($tmp_id,',');

         if ($active_only) {