From: Alan H. <min...@us...> - 2005-01-31 18:31:32
|
Update of /cvsroot/gallery/gallery2/modules/core/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13609/modules/core/classes Modified Files: GalleryPlugin.class Log Message: fix bad error return Index: GalleryPlugin.class =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/core/classes/GalleryPlugin.class,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GalleryPlugin.class 28 Jan 2005 23:41:31 -0000 1.3 +++ GalleryPlugin.class 31 Jan 2005 18:31:01 -0000 1.4 @@ -4,17 +4,17 @@ * * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2005 Bharat Mediratta - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. - * + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -140,10 +140,10 @@ function activate() { $pluginType = $this->getPluginType(); $pluginId = $this->getId(); - + list ($ret, $pluginStatus) = GalleryCoreApi::fetchPluginStatus($pluginType); if ($ret->isError()) { - return $ret->wrap(__FILE__, __LINE__); + return array($ret->wrap(__FILE__, __LINE__), null); } GalleryCoreApi::relativeRequireOnce('modules/core/classes/GalleryPluginMap.class'); @@ -180,7 +180,7 @@ function deactivate() { $pluginType = $this->getPluginType(); $pluginId = $this->getId(); - + GalleryCoreApi::relativeRequireOnce('modules/core/classes/GalleryPluginMap.class'); $ret = GalleryPluginMap::updateMapEntry(array('pluginType' => $pluginType, 'pluginId' => $pluginId), @@ -367,7 +367,7 @@ function getL10Domain() { return $this->_l10Domain; } - + function setL10Domain($l10Domain) { $this->_l10Domain = $l10Domain; } @@ -383,7 +383,7 @@ function setRequiredModuleApi($requirement) { $this->_requiredModuleApi = $requirement; } - + function getRequiredModuleApi() { return $this->_requiredModuleApi; } |