From 43e700149db19863b559e0eebc44132c611ef08d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 26 Nov 2013 12:19:18 +0100
Subject: fix numeric expression read in plugin default conf FS#2888

---
 lib/plugins/config/settings/config.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/plugins/config')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index a5a11cda1..ab76ddc9e 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -330,8 +330,7 @@ if (!class_exists('configuration')) {
             foreach ($this->get_plugin_list() as $plugin) {
                 $plugin_dir = plugin_directory($plugin);
                 if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
-                    $conf = array();
-                    @include(DOKU_PLUGIN.$plugin_dir.$file);
+                    $conf = $this->_read_config(DOKU_PLUGIN.$plugin_dir.$file);
                     foreach ($conf as $key => $value){
                         $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
                     }
-- 
cgit v1.2.3


From 8c58242fcc4654752ab53c46ec31d1bc4a622140 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 26 Nov 2013 12:47:40 +0100
Subject: FS#2888 fix for templates

---
 lib/plugins/config/settings/config.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/plugins/config')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index ab76ddc9e..05f8470f7 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -339,8 +339,7 @@ if (!class_exists('configuration')) {
 
             // the same for the active template
             if (@file_exists(tpl_incdir().$file)){
-                $conf = array();
-                @include(tpl_incdir().$file);
+                $conf = $this->_read_config(tpl_incdir().$file);
                 foreach ($conf as $key => $value){
                     $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
                 }
-- 
cgit v1.2.3


From ca149a9e03f5204d75344eb1ee5aa8698f3eb612 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Fri, 24 Jan 2014 22:05:58 +0900
Subject: translation update

---
 lib/plugins/config/lang/ko/intro.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/plugins/config')

diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index d0b85606c..979bbcb14 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -6,4 +6,3 @@
 
 이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
 
-
-- 
cgit v1.2.3


From 975e2a1982518e206667387f0540ce46e5c482ca Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Jan 2014 17:33:18 +0100
Subject: removed empty language files

our translation interface used to submit empty files for a while but no
longer does, so these can go
---
 lib/plugins/config/lang/hr/lang.php | 8 --------
 lib/plugins/config/lang/id/lang.php | 7 -------
 lib/plugins/config/lang/kk/lang.php | 6 ------
 lib/plugins/config/lang/lb/lang.php | 6 ------
 lib/plugins/config/lang/mk/lang.php | 6 ------
 lib/plugins/config/lang/ms/lang.php | 6 ------
 lib/plugins/config/lang/vi/lang.php | 5 -----
 7 files changed, 44 deletions(-)
 delete mode 100644 lib/plugins/config/lang/hr/lang.php
 delete mode 100644 lib/plugins/config/lang/id/lang.php
 delete mode 100644 lib/plugins/config/lang/kk/lang.php
 delete mode 100644 lib/plugins/config/lang/lb/lang.php
 delete mode 100644 lib/plugins/config/lang/mk/lang.php
 delete mode 100644 lib/plugins/config/lang/ms/lang.php
 delete mode 100644 lib/plugins/config/lang/vi/lang.php

(limited to 'lib/plugins/config')

diff --git a/lib/plugins/config/lang/hr/lang.php b/lib/plugins/config/lang/hr/lang.php
deleted file mode 100644
index 96f1d6afe..000000000
--- a/lib/plugins/config/lang/hr/lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Croatian language file
- *
- * @author Branko Rihtman <theney@gmail.com>
- * @author Dražen Odobašić <dodobasic@gmail.com>
- * @author Dejan Igrec dejan.igrec@gmail.com
- */
diff --git a/lib/plugins/config/lang/id/lang.php b/lib/plugins/config/lang/id/lang.php
deleted file mode 100644
index c3d485930..000000000
--- a/lib/plugins/config/lang/id/lang.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * Indonesian language file
- *
- * @author Irwan Butar Butar <irwansah.putra@gmail.com>
- * @author Yustinus Waruwu <juswaruwu@gmail.com>
- */
diff --git a/lib/plugins/config/lang/kk/lang.php b/lib/plugins/config/lang/kk/lang.php
deleted file mode 100644
index dde5b9577..000000000
--- a/lib/plugins/config/lang/kk/lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * kazakh language file
- *
- * @author Nurgozha Kaliaskarov astana08@gmail.com
- */
diff --git a/lib/plugins/config/lang/lb/lang.php b/lib/plugins/config/lang/lb/lang.php
deleted file mode 100644
index 59acdf7a8..000000000
--- a/lib/plugins/config/lang/lb/lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * lb language file
- *
- * @author joel@schintgen.net
- */
diff --git a/lib/plugins/config/lang/mk/lang.php b/lib/plugins/config/lang/mk/lang.php
deleted file mode 100644
index 6d4530f79..000000000
--- a/lib/plugins/config/lang/mk/lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * Macedonian language file
- *
- * @author Dimitar Talevski <dimi3.14@gmail.com>
- */
diff --git a/lib/plugins/config/lang/ms/lang.php b/lib/plugins/config/lang/ms/lang.php
deleted file mode 100644
index 77ad2a1c1..000000000
--- a/lib/plugins/config/lang/ms/lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * Malay language file
- *
- * @author Markos
- */
diff --git a/lib/plugins/config/lang/vi/lang.php b/lib/plugins/config/lang/vi/lang.php
deleted file mode 100644
index 2933d8875..000000000
--- a/lib/plugins/config/lang/vi/lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-/**
- * Vietnamese language file
- *
- */
-- 
cgit v1.2.3