Aleksander Machniak
2013-12-08 029f7a157da4be15302b3eaf40232c110d27bcf1
program/lib/Roundcube/rcube_plugin_api.php
@@ -198,7 +198,7 @@
                // check inheritance...
                if (is_subclass_of($plugin, 'rcube_plugin')) {
                    // ... task, request type and framed mode
                    if ($force || (!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task))
                    if (($force || !$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task))
                        && (!$plugin->noajax || (is_object($this->output) && $this->output->type == 'html'))
                        && (!$plugin->noframe || empty($_REQUEST['_framed']))
                    ) {
@@ -284,6 +284,7 @@
        $composer = INSTALL_PATH . "/plugins/$plugin_name/composer.json";
        if (file_exists($composer) && ($json = @json_decode(file_get_contents($composer), true))) {
          list($info['vendor'], $info['name']) = explode('/', $json['name']);
          $info['version'] = $json['version'];
          $info['license'] = $json['license'];
          if ($license_uri = $license_uris[$info['license']])
            $info['license_uri'] = $license_uri;