Ticket #2543: 2543.patch

File 2543.patch, 940 bytes (added by Glenn, 11 years ago)
  • FCKeditor.body.php

     
    5959        }
    6060
    6161        private function getExcludedNamespaces() {
    62                 global $wgUser;
     62                global $wgUser, $wgFCKexcludedNamespaces;
    6363
    6464                if ( is_null( $this->excludedNamespaces ) ) {
    6565                        $this->excludedNamespaces = array();
     
    6868                                        $this->excludedNamespaces[] = constant(strtoupper(str_replace("riched_disable_", "", $toggle)));
    6969                                }
    7070                        }
     71                /*
     72                If this site's LocalSettings.php defines Namespaces that shouldn't use the FCKEditor (in the #wgFCKexcludedNamespaces array), those excluded
     73                namespaces should be combined with those excluded in the user's preferences.
     74                */
     75                $this->excludedNamespaces = array_merge((array)$wgFCKexcludedNamespaces, $this->excludedNamespaces);
    7176                }
    7277
    7378                return $this->excludedNamespaces;
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy