Merge branch 'master' of github.com:splitbrain/dokuwiki

12 files changed, 14 insertions, 26 deletions

diff --git a/inc/actions.php b/inc/actions.php
index ddfafc554..4a2e200ae 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -215,7 +215,7 @@ function act_clean($act){
     //disable all acl related commands if ACL is disabled
     if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin',
                     'subscribe','unsubscribe','profile','revert',
-                    'resendpwd','subscribens','unsubscribens',))){
+                    'resendpwd'))){
         msg('Command unavailable: '.htmlspecialchars($act),-1);
         return 'show';
     }
@@ -227,7 +227,7 @@ function act_clean($act){
                     'preview','search','show','check','index','revisions',
                     'diff','recent','backlink','admin','subscribe','revert',
                     'unsubscribe','profile','resendpwd','recover',
-                    'draftdel','subscribens','unsubscribens','sitemap','media')) && substr($act,0,7) != 'export_' ) {
+                    'draftdel','sitemap','media')) && substr($act,0,7) != 'export_' ) {
         msg('Command unknown: '.htmlspecialchars($act),-1);
         return 'show';
     }
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 14ce18c2a..13ba7b3c3 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -38,8 +38,6 @@ $lang['btn_backlink']          = 'Bura olan link-lər';
 $lang['btn_backtomedia']       = 'media-fayl seçiminə qayıt';
 $lang['btn_subscribe']         = 'Abunə ol (bütün dəyişiklər)';
 $lang['btn_unsubscribe']       = 'Abunəlikdən çıx (bütün dəyişiklər)';
-$lang['btn_subscribens']       = 'Abunə ol (bu bölümün dəyişikləri)';
-$lang['btn_unsubscribens']     = 'Abunəlikdən çıx (bu bölümün dəyişikləri)';
 $lang['btn_profile']           = 'Profil';
 $lang['btn_reset']             = 'Boşalt';
 $lang['btn_resendpwd']         = 'Yeni şifrəni göndər';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 4fc4dfa50..eac9fc8d1 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -39,8 +39,6 @@ $lang['btn_backlink']          = 'Vínculs remitents';
 $lang['btn_backtomedia']       = 'Tornar a la selecció d\'archius de mijos';
 $lang['btn_subscribe']         = 'Subscriure\'s a la pàgina';
 $lang['btn_unsubscribe']       = 'Desubscriure\'s de la pàgina';
-$lang['btn_subscribens']       = 'Subscriure\'s a l\'espai de noms';
-$lang['btn_unsubscribens']     = 'Desubscriure\'s de l\'espai de noms';
 $lang['btn_profile']           = 'Actualisar perfil';
 $lang['btn_reset']             = 'Reiniciar';
 $lang['btn_resendpwd']         = 'Enviar contrasenya nova';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 41ee389d8..7094df5b4 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -39,8 +39,6 @@ $lang['btn_backlink']          = 'Què hi enllaça';
 $lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
 $lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
 $lang['btn_unsubscribe']       = 'Cancel·la subscripció a pàgina';
-$lang['btn_subscribens']       = 'Subscripció a canvis d\'aquest espai';
-$lang['btn_unsubscribens']     = 'Cancel·la subscripció a espai';
 $lang['btn_profile']           = 'Actualització del perfil';
 $lang['btn_reset']             = 'Reinicia';
 $lang['btn_resendpwd']         = 'Envia nova contrasenya';
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index 7388e6908..0e281e58d 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -45,8 +45,6 @@ $lang['btn_backlink']          = 'Hvað tengist hingað';
 $lang['btn_backtomedia']       = 'Aftur til miðlaskrá';
 $lang['btn_subscribe']         = 'Vakta';
 $lang['btn_unsubscribe']       = 'Afvakta';
-$lang['btn_subscribens']       = 'Vakta breytingar á nafnrými';
-$lang['btn_unsubscribens']     = 'Afvakta breytingar á nafnrými';
 $lang['btn_profile']           = 'Uppfæra notanda';
 $lang['btn_reset']             = 'Endurstilla';
 $lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index b42035026..d14a0695a 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -41,8 +41,6 @@ $lang['btn_backlink']          = 'Atgalinės nuorodos';
 $lang['btn_backtomedia']       = 'Atgal į Mediabylos išsirinkimą';
 $lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
 $lang['btn_unsubscribe']       = 'Atsisakyti keitimų prenumeratos';
-$lang['btn_subscribens']       = 'Užsakyti vardų srities prenumeratą';
-$lang['btn_unsubscribens']     = 'Atsisakyti vardų srities prenumeratos';
 $lang['btn_profile']           = 'Atnaujinti profilį';
 $lang['btn_reset']             = 'Atstata';
 $lang['btn_resendpwd']         = 'Išsiųsti naują slaptažodį';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 02bda19d6..63fda3e5a 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -45,8 +45,6 @@ $lang['btn_backlink']          = 'येथे काय जोडले आह�
 $lang['btn_backtomedia']       = 'परत माध्यम फाइल निवडीकड़े';
 $lang['btn_subscribe']         = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा ';
 $lang['btn_unsubscribe']       = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा';
-$lang['btn_subscribens']       = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) लावा';
-$lang['btn_unsubscribens']     = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) बंद करा';
 $lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
 $lang['btn_reset']             = 'रिसेट';
 $lang['btn_resendpwd']         = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 5d572ccd9..97e2dde5c 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -38,8 +38,6 @@ $lang['btn_backlink']          = 'पछाडिका लिङ्कहरु
 $lang['btn_backtomedia']       = 'मिडिया छनौटमा फर्कनुहोस्';
 $lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्';
 $lang['btn_unsubscribe']       = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्';
-$lang['btn_subscribens']       = 'नेमस्पेस परिवर्तन ग्राह्य गर्नुहोस् ';
-$lang['btn_unsubscribens']     = 'नेमस्पेस परिवर्तन अग्राह्य गर्नुहोस् ';
 $lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
 $lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
 $lang['btn_resendpwd']         = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् ';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index c447bf61c..0d0613961 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -46,8 +46,6 @@ $lang['btn_backlink']          = 'หน้าที่ลิงก์มา';
 $lang['btn_backtomedia']       = 'กลับไปยังหน้าเลือกไฟล์สื่อ';
 $lang['btn_subscribe']         = 'เฝ้าดู';
 $lang['btn_unsubscribe']       = 'เลิกเฝ้าดู';
-$lang['btn_subscribens']       = 'สมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
-$lang['btn_unsubscribens']     = 'ยกเลิกสมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
 $lang['btn_profile']           = 'แก้ข้อมูลผู้ใช้';
 $lang['btn_reset']             = 'เริ่มใหม่';
 $lang['btn_resendpwd']         = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล';
diff --git a/inc/media.php b/inc/media.php
index 7da1f0899..dab0bcef2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -698,7 +698,11 @@ function _media_get_display_param($param, $values) {
         // FIXME: Set cookie
         return $_REQUEST[$param];
     } else {
-        return get_doku_pref($param, $values['default']);
+        $val = get_doku_pref($param, $values['default']);
+        if (!in_array($val, $values)) {
+            $val = $values['default'];
+        }
+        return $val;
     }
 }
 
diff --git a/inc/template.php b/inc/template.php
index f98385adb..c70e407d6 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -631,10 +631,6 @@ function tpl_get_action($type) {
                 return false;
             }
             break;
-        case 'subscribens':
-            // Superseded by subscribe/subscription
-            return '';
-            break;
         case 'media':
             break;
         default:
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 8e4141d4e..e5e3298ae 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 /**
  * Increased whenever the API is changed
  */
-define('DOKU_XMLRPC_API_VERSION',5);
+define('DOKU_XMLRPC_API_VERSION', 6);
 
 require_once(DOKU_INC.'inc/init.php');
 session_write_close();  //close session
@@ -584,8 +584,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
 
         // save temporary file
         @unlink($ftmp);
-        $buff = base64_decode($file);
-        io_saveFile($ftmp, $buff);
+        if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) {
+            // DEPRECATED: Double-decode file if it still looks like base64
+            // after first decoding (which is done by the library)
+            $file = base64_decode($file);
+        }
+        io_saveFile($ftmp, $file);
 
         $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename');
         if (is_array($res)) {