Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-14 7cf3e98090a3e9f0a9cc960d07c5f259adab6a19

 interface/lib/classes/aps_guicontroller.inc.php

@@ -730,7 +730,6 @@
                    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'] = '';