Merge remote-tracking branch 'origin/master' into diff_navigation

1 files changed, 6 insertions, 7 deletions

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 4c940b39e..2eb8ea403 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -88,12 +88,12 @@ class RemoteAPICore {
             ), 'wiki.getPageInfo' => array(
                 'args' => array('string'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the page.',
+                'doc' => 'Returns a struct with info about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageInfoVersion' => array(
                 'args' => array('string', 'int'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the page.',
+                'doc' => 'Returns a struct with info about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageVersions' => array(
                 'args' => array('string', 'int'),
@@ -136,7 +136,7 @@ class RemoteAPICore {
             ), 'wiki.getAttachmentInfo' => array(
                 'args' => array('string'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the attachment.'
+                'doc' => 'Returns a struct with info about the attachment.'
             ), 'dokuwiki.getXMLRPCAPIVersion' => array(
                 'args' => array(),
                 'name' => 'getAPIVersion',
@@ -333,7 +333,6 @@ class RemoteAPICore {
         if (!is_array($options)) $options = array();
         $options['skipacl'] = 0; // no ACL skipping for XMLRPC
 
-
         if(auth_quickaclcheck($ns.':*') >= AUTH_READ) {
             $dir = utf8_encodeFN(str_replace(':', '/', $ns));
 
@@ -506,8 +505,8 @@ class RemoteAPICore {
     }
 
     /**
-    * Returns the permissions of a given wiki page
-    */
+     * Returns the permissions of a given wiki page
+     */
     function aclCheck($id) {
         $id = $this->resolvePageId($id);
         return auth_quickaclcheck($id);
@@ -772,7 +771,7 @@ class RemoteAPICore {
         $id = cleanID($id);
         if(empty($id)) {
             global $conf;
-            $id = cleanID($conf['start']);	
+            $id = cleanID($conf['start']);
         }
         return $id;
     }