opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove unneeded try/catch blocks 

they were just catching and rethrowing
This commit is contained in:
Andreas Gohr 2014-01-08 20:18:04 +01:00
parent cf37525f0a
commit ec8911d497
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/plugins/extension/helper/extension.php
View File

@ -613,19 +613,15 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
* @return array The list of installed extensions
*/
public function installOrUpdate() {
try {
$path = $this->download($this->getDownloadURL());
$installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
$path = $this->download($this->getDownloadURL());
$installed = $this->installArchive($path, $this->isInstalled(), $this->getBase());
// refresh extension information
if (!isset($installed[$this->getID()])) {
throw new Exception('Error, the requested extension hasn\'t been installed or updated');
}
$this->setExtension($this->getID());
$this->purgeCache();
}catch (Exception $e){
throw $e;
// refresh extension information
if (!isset($installed[$this->getID()])) {
throw new Exception('Error, the requested extension hasn\'t been installed or updated');
}
$this->setExtension($this->getID());
$this->purgeCache();
return $installed;
}
@ -828,11 +824,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin {
}
// decompress
try{
$this->decompress($file, "$tmp/".$base);
} catch (Exception $e) {
throw $e;
}
$this->decompress($file, "$tmp/".$base);
// search $tmp/$base for the folder(s) that has been created
// move the folder(s) to lib/..