From 1ff30f7cc7159bfa0235a7df3f60c0771a0e22a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fa=C3=9Fbender?= <markus.fassbender@gmail.com>
Date: Thu, 20 Jan 2022 09:56:04 +0100
Subject: [PATCH] fix database type identification

---
 adm_program/modules/photos/photo_album_new.php | 6 +++---
 adm_program/system/classes/TableAccess.php     | 6 +++++-
 adm_program/system/classes/TablePhotos.php     | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/adm_program/modules/photos/photo_album_new.php b/adm_program/modules/photos/photo_album_new.php
index c706ee28b..2f93f0f43 100644
--- a/adm_program/modules/photos/photo_album_new.php
+++ b/adm_program/modules/photos/photo_album_new.php
@@ -115,7 +115,7 @@ function subfolder($parentId, $vorschub, TablePhotos $photoAlbum, $phoId)
 $form->addInput(
     'pho_name',
     $gL10n->get('PHO_ALBUM'),
-    $photoAlbum->getValue('pho_name'),
+    $photoAlbum->getValue('pho_name', 'database'),
     array('property' => HtmlForm::FIELD_REQUIRED, 'maxLength' => 50)
 );
 subfolder(0, '', $photoAlbum, $photoAlbum->getValue('pho_id'));
@@ -145,13 +145,13 @@ function subfolder($parentId, $vorschub, TablePhotos $photoAlbum, $phoId)
 $form->addInput(
     'pho_photographers',
     $gL10n->get('PHO_PHOTOGRAPHER'),
-    $photoAlbum->getValue('pho_photographers'),
+    $photoAlbum->getValue('pho_photographers', 'database'),
     array('maxLength' => 100)
 );
 $form->addMultilineTextInput(
     'pho_description',
     $gL10n->get('SYS_DESCRIPTION'),
-    $photoAlbum->getValue('pho_description'),
+    $photoAlbum->getValue('pho_description', 'database'),
     6,
     array('maxLength' => 4000)
 );
diff --git a/adm_program/system/classes/TableAccess.php b/adm_program/system/classes/TableAccess.php
index a43473689..f5777388e 100644
--- a/adm_program/system/classes/TableAccess.php
+++ b/adm_program/system/classes/TableAccess.php
@@ -627,7 +627,11 @@ protected function setColumnsInfos()
                     }
                 }
                 $this->columnsInfos[$columnName]['changed'] = false;
-                $this->columnsInfos[$columnName]['type'] = $property['type'];
+                if(strpos($property['type'], '(') > 0) {
+                    $this->columnsInfos[$columnName]['type'] = substr($property['type'], 0, strpos($property['type'], '('));
+                } else {
+                    $this->columnsInfos[$columnName]['type'] = $property['type'];
+                }
                 $this->columnsInfos[$columnName]['null'] = $property['null'];
                 $this->columnsInfos[$columnName]['key'] = $property['key'];
                 $this->columnsInfos[$columnName]['serial'] = $property['serial'];
diff --git a/adm_program/system/classes/TablePhotos.php b/adm_program/system/classes/TablePhotos.php
index 284c72541..d77c6c389 100644
--- a/adm_program/system/classes/TablePhotos.php
+++ b/adm_program/system/classes/TablePhotos.php
@@ -179,8 +179,6 @@ public function deleteInDatabase($photoId)
      */
     public function getValue($columnName, $format = '')
     {
-        global $gL10n;
-
         if ($columnName === 'pho_description' && $format === 'html') {
             $value = nl2br(parent::getValue($columnName));
         } else {