Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

 interface/lib/classes/aps_guicontroller.inc.php

@@ -730,6 +730,7 @@
                    basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$icon);

         // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path

         $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);



            $pkg['Icon'] = $path;

        }

        else $pkg['Icon'] = '';