Peter M. Groen / knowledgetree

Commit 2676819e98b29c8aa716ea28aca4dc8be826f667

Authored by conradverm
1 parent 320ad45a

KTS-2893 

"Uninstalled columns may cause browsing the repository to break"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7973 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 16 additions and 11 deletions
lib/browse/columnregistry.inc.php
  View file @2676819
@@ -6,32 +6,32 @@ @@ -6,32 +6,32 @@
6 * KnowledgeTree Open Source Edition 6 * KnowledgeTree Open Source Edition
7 * Document Management Made Simple 7 * Document Management Made Simple
8 * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited 8 * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
9 - * 9 + *
10 * This program is free software; you can redistribute it and/or modify it under 10 * This program is free software; you can redistribute it and/or modify it under
11 * the terms of the GNU General Public License version 3 as published by the 11 * the terms of the GNU General Public License version 3 as published by the
12 * Free Software Foundation. 12 * Free Software Foundation.
13 - * 13 + *
14 * This program is distributed in the hope that it will be useful, but WITHOUT 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 * details. 17 * details.
18 - * 18 + *
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 - * 21 + *
22 * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place, 22 * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
23 * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com. 23 * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
24 - * 24 + *
25 * The interactive user interfaces in modified source and object code versions 25 * The interactive user interfaces in modified source and object code versions
26 * of this program must display Appropriate Legal Notices, as required under 26 * of this program must display Appropriate Legal Notices, as required under
27 * Section 5 of the GNU General Public License version 3. 27 * Section 5 of the GNU General Public License version 3.
28 - * 28 + *
29 * In accordance with Section 7(b) of the GNU General Public License version 3, 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 * these Appropriate Legal Notices must retain the display of the "Powered by 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31 - * KnowledgeTree" logo and retain the original copyright notice. If the display of the 31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33 - * must display the words "Powered by KnowledgeTree" and retain the original  
34 - * copyright notice. 33 + * must display the words "Powered by KnowledgeTree" and retain the original
  34 + * copyright notice.
35 * Contributor( s): ______________________________________ 35 * Contributor( s): ______________________________________
36 * 36 *
37 */ 37 */
@@ -93,8 +93,13 @@ class KTColumnRegistry { @@ -93,8 +93,13 @@ class KTColumnRegistry {
93 $view_columns = array(); 93 $view_columns = array();
94 foreach ($view_column_entries as $oEntry) { 94 foreach ($view_column_entries as $oEntry) {
95 $res = $this->getColumn($oEntry->getColumnNamespace()); 95 $res = $this->getColumn($oEntry->getColumnNamespace());
96 - if (PEAR::isError($res)) { return $res; }  
97 - 96 + if (PEAR::isError($res))
  97 + {
  98 + // this was returning before, but the function calling this is just doing
  99 + // an array merge, so the error propogation is not great.
  100 + // if this is an unexpected column, lets just skip it for now.
  101 + continue;
  102 + }
98 $aOptions = $oEntry->getConfigArray(); 103 $aOptions = $oEntry->getConfigArray();
99 $aOptions['column_id'] = $oEntry->getId(); 104 $aOptions['column_id'] = $oEntry->getId();
100 $aOptions['required_in_view'] = $oEntry->getRequired(); 105 $aOptions['required_in_view'] = $oEntry->getRequired();