This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Lx-Office ERP".
The branch master has been updated
via 92a5ad8ae82416931f56abdcd7a00c939f0d47da (commit)
from c3cbcf4f45b0d3de476c0f8a4a51e1c0d2e4eb00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92a5ad8ae82416931f56abdcd7a00c939f0d47da
Author: Moritz Bunkus <m.bunkus@...>
Date: Wed Jan 19 12:04:56 2011 +0100
Lx-Office kann ohne Rose::DB::Object nicht betrieben werden, also Konfigurationsoption entfernt
-----------------------------------------------------------------------
Summary of changes:
bin/mozilla/common.pl | 10 +++-------
config/lx-erp.conf | 9 +--------
config/lx-erp.conf.default | 9 +--------
3 files changed, 5 insertions(+), 23 deletions(-)
Full change list:
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index a6f7ef4..8398fb7 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -11,6 +11,7 @@
use Carp;
use SL::Common;
+use SL::DB::Helper::Mappings;
use SL::DBUtils;
use SL::Form;
use SL::MoreCommon;
@@ -728,13 +729,8 @@ sub gl_transaction {
$main::lxdebug->leave_sub();
}
-if ($::use_rdbo) {
- eval {
- require SL::DB::Helper::Mappings;
- sub db {
- goto &SL::DB::Helper::Mappings::db;
- }
- } or die $@;
+sub db {
+ goto &SL::DB::Helper::Mappings::db;
}
1;
diff --git a/config/lx-erp.conf b/config/lx-erp.conf
index 16e50bc..84e8da6 100644
--- a/config/lx-erp.conf
+++ b/config/lx-erp.conf
@@ -6,7 +6,7 @@ our qw(
$openofficeorg_daemon $openofficeorg_daemon_port $openofficeorg_writer_bin
$parts_image_css $parts_listing_images $parts_show_image $pg_dump_exe
$pg_restore_exe $sendmail $show_best_before $sid $spool $templates
- $use_rdbo $userspath $vertreter $webdav $xvfb_bin
+ $userspath $vertreter $webdav $xvfb_bin
);
# path to user configuration files
@@ -106,13 +106,6 @@ $latex_bin = 'pdflatex';
$pg_dump_exe = "pg_dump";
$pg_restore_exe = "pg_restore";
-# Rose::DB::Object Environment laden.
-# Die RDBO Klassen bieten für Addon Schreiber sehr einfache Interfaces zu den
-# bestehenden Klassen, haben aber den Nachteil, dass der Start des Programms
-# etwa 2s mehr dauert. Damit fällt die Möglichkeit Lx-Office über CGI zu
-# betreiben weg.
-$use_rdbo = 1;
-
# Globale Debug-Ausgaben (de-)aktivieren? Moegliche Werte sind
# LXDebug::NONE - keine Debugausgaben
# LXDebug::INFO
diff --git a/config/lx-erp.conf.default b/config/lx-erp.conf.default
index 16e50bc..84e8da6 100644
--- a/config/lx-erp.conf.default
+++ b/config/lx-erp.conf.default
@@ -6,7 +6,7 @@ our qw(
$openofficeorg_daemon $openofficeorg_daemon_port $openofficeorg_writer_bin
$parts_image_css $parts_listing_images $parts_show_image $pg_dump_exe
$pg_restore_exe $sendmail $show_best_before $sid $spool $templates
- $use_rdbo $userspath $vertreter $webdav $xvfb_bin
+ $userspath $vertreter $webdav $xvfb_bin
);
# path to user configuration files
@@ -106,13 +106,6 @@ $latex_bin = 'pdflatex';
$pg_dump_exe = "pg_dump";
$pg_restore_exe = "pg_restore";
-# Rose::DB::Object Environment laden.
-# Die RDBO Klassen bieten für Addon Schreiber sehr einfache Interfaces zu den
-# bestehenden Klassen, haben aber den Nachteil, dass der Start des Programms
-# etwa 2s mehr dauert. Damit fällt die Möglichkeit Lx-Office über CGI zu
-# betreiben weg.
-$use_rdbo = 1;
-
# Globale Debug-Ausgaben (de-)aktivieren? Moegliche Werte sind
# LXDebug::NONE - keine Debugausgaben
# LXDebug::INFO
hooks/post-receive
--
Lx-Office ERP
|