From: Jan Büren <jan@kivitendo-premium.de>
Date: Thu, 30 Jan 2014 14:09:17 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8315221e21e3560978855576856c02ee56695d35;hp=d63ea7c6b814244c99eb40d56633a96debf93a3f;p=kivitendo-erp.git

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm
index b366ffbf2..33c3dec40 100644
--- a/SL/Controller/CustomVariableConfig.pm
+++ b/SL/Controller/CustomVariableConfig.pm
@@ -59,10 +59,13 @@ sub action_new {
 sub show_form {
   my ($self, %params) = @_;
 
-  $self->flags([
-    map { split m/=/, 2 }
+  $self->flags({
+    map { split m/=/, $_, 2 }
     split m/;/, ($self->config->flags || '')
-  ]);
+  });
+
+  $::lxdebug->dump(0, "cflags", $self->config->flags);
+  $::lxdebug->dump(0, "flags", $self->flags);
 
   $self->render('custom_variable_config/form', %params);
 }
diff --git a/css/Mobile/menuv3.css b/css/Mobile/menuv3.css
deleted file mode 120000
index 1bd817a3c..000000000
--- a/css/Mobile/menuv3.css
+++ /dev/null
@@ -1 +0,0 @@
-../lx-office-erp/menuv3.css
\ No newline at end of file
diff --git a/css/Mobile/tabcontent.css b/css/Mobile/tabcontent.css
deleted file mode 120000
index 487ba3fae..000000000
--- a/css/Mobile/tabcontent.css
+++ /dev/null
@@ -1 +0,0 @@
-../lx-office-erp/tabcontent.css
\ No newline at end of file
diff --git a/css/Mobile/ui-lightness b/css/Mobile/ui-lightness
index 9f2cad02e..2218301f1 120000
--- a/css/Mobile/ui-lightness
+++ b/css/Mobile/ui-lightness
@@ -1 +1 @@
-../lx-office-erp/ui-lightness/
\ No newline at end of file
+../ui-lightness
\ No newline at end of file
diff --git a/js/jqModal.js b/js/jqModal.js
deleted file mode 120000
index 4f218050d..000000000
--- a/js/jqModal.js
+++ /dev/null
@@ -1 +0,0 @@
-jqModal/jqModal.js
\ No newline at end of file