Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 server/lib/classes/plugins.inc.php

@@ -43,7 +43,7 @@
      global $app,$conf;

      $subPath = 'plugins-enabled';
      if ($type == 'core') $subPath = 'plugins-core';
      //if ($type == 'core') $subPath = 'plugins-core';
      
      $plugins_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div'];
      $tmp_plugins = array();