Peter M. Groen / knowledgetree

Commit 6bbd83dfcab1b8d30a2fce1301e41be15ff57dd3

Authored by donald_jackson
1 parent 9da8998d

"Fatal error when attempting to do a bulk upload after upgrade from 352c OSS" 

KTC-661
Removed static keyword from getField* functions as Proxy mechanism isn't PHP5 compliant. Added code to ensure KTEntity does not proxy magic functions.

Committed by: Donald Jackson
Reviewed by: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/RB_3.5.4a@9683 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
lib/documentmanagement/documentmetadataversion.inc.php
  View file @6bbd83d
@@ -106,7 +106,6 @@ class KTDocumentMetadataVersion extends KTEntity { @@ -106,7 +106,6 @@ class KTDocumentMetadataVersion extends KTEntity {
106 $this->_aFieldToSelect = KTDocumentMetaDataVersion::getFieldsToSelect(); 106 $this->_aFieldToSelect = KTDocumentMetaDataVersion::getFieldsToSelect();
107 } 107 }
108 108
109 - static  
110 function getFieldsToSelect() { 109 function getFieldsToSelect() {
111 if(self::$_versionFields == null) { 110 if(self::$_versionFields == null) {
112 $sTable = KTUtil::getTableName('document_metadata_version'); 111 $sTable = KTUtil::getTableName('document_metadata_version');
@@ -120,7 +119,6 @@ class KTDocumentMetadataVersion extends KTEntity { @@ -120,7 +119,6 @@ class KTDocumentMetadataVersion extends KTEntity {
120 return self::$_versionFields; 119 return self::$_versionFields;
121 } 120 }
122 121
123 - static  
124 function getFieldType($dbType) { 122 function getFieldType($dbType) {
125 /* Integer test */ 123 /* Integer test */
126 if(strpos($dbType, "int") !== FALSE) { 124 if(strpos($dbType, "int") !== FALSE) {
lib/ktentity.inc
  View file @6bbd83d
@@ -743,6 +743,10 @@ class KTEntityUtil { @@ -743,6 +743,10 @@ class KTEntityUtil {
743 $allcode[] = sprintf('var $cacheGlobal = null;%s', "\n"); 743 $allcode[] = sprintf('var $cacheGlobal = null;%s', "\n");
744 744
745 foreach ($methods as $sMethod) { 745 foreach ($methods as $sMethod) {
  746 + if(substr($sMethod, 0, 2) == '__') {
  747 + /* We don't want magic functions in our proxy classes */
  748 + continue;
  749 + }
746 if ($sMethod == 'getid') { 750 if ($sMethod == 'getid') {
747 $code = sprintf('function getId() { return $this->iId; }'); 751 $code = sprintf('function getId() { return $this->iId; }');
748 } else if ($sMethod == '_table' || $sMethod == 'update' ) { 752 } else if ($sMethod == '_table' || $sMethod == 'update' ) {