Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 server/lib/classes/aps_installer.inc.php

@@ -445,11 +445,11 @@
                $this->file_owner_user = $owner_res['system_user']; 

                $this->file_owner_group = $owner_res['system_group'];

                exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath));

				
            //* Chown stats directory back

            if(is_dir($this->local_installpath.'stats')) {

               exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));

            }



      //* Chown stats directory back

      if(is_dir($this->local_installpath.'stats')) {

         exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats'));

      }

            }

        }

        catch(Exception $e)

@@ -717,4 +717,4 @@
        unset($sxe);

    }

}

?>
?>