diff --git a/include/notiz.class.php b/include/notiz.class.php index 6e4edd0df..c2e4c4ebf 100644 --- a/include/notiz.class.php +++ b/include/notiz.class.php @@ -325,7 +325,7 @@ class notiz extends basis_db FROM public.tbl_notiz LEFT JOIN public.tbl_notizzuordnung USING(notiz_id) - WHERE 1=1 AND AND tbl_notiz.typ IS NULL "; + WHERE 1=1 AND tbl_notiz.typ IS NULL "; if(!is_null($erledigt)) { diff --git a/system/dbupdate_3.4/48526_pep_tagging.php b/system/dbupdate_3.4/48526_pep_tagging.php index d935d9e92..ffcbd2820 100644 --- a/system/dbupdate_3.4/48526_pep_tagging.php +++ b/system/dbupdate_3.4/48526_pep_tagging.php @@ -41,7 +41,7 @@ if (!$result = @$db->db_query('SELECT 0 FROM public.tbl_notiz_typ WHERE 0 = 1')) if(!@$db->db_query("SELECT typ FROM public.tbl_notiz LIMIT 1")) { $qry = 'ALTER TABLE public.tbl_notiz ADD COLUMN typ varchar(32); - ALTER TABLE public.tbl_notiz ADD CONSTRAINT tbl_notiz_typ_fkey FOREIGN KEY (typ) REFERENCES public.tbl_notiz_typ (typ_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;'; + ALTER TABLE public.tbl_notiz ADD CONSTRAINT tbl_notiz_typ_fkey FOREIGN KEY (typ) REFERENCES public.tbl_notiz_typ (typ_kurzbz) ON DELETE CASCADE ON UPDATE CASCADE;'; if(!$db->db_query($qry)) echo ' public.tbl_notiz '.$db->db_last_error().'
';