From: Gabriel Wicke Date: Thu, 13 May 2004 11:54:19 +0000 (+0000) Subject: removed section folding X-Git-Tag: 1.3.0beta1~79 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=df08e4792a49fbc260fada57f00d0343ed61c538;p=lhc%2Fweb%2Fwiklou.git removed section folding --- diff --git a/includes/Article.php b/includes/Article.php index 71ffb693ab..0ac58b9eef 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -64,16 +64,14 @@ class Article { # Return the text of this revision function getContent( $noredir ) { - global $wgRequest,$wgUser,$wgOut; - - $fname = "Article::getContent"; - wfProfileIn( $fname ); + global $wgRequest; # Get variables from query string :P $action = $wgRequest->getText( 'action', 'view' ); $section = $wgRequest->getText( 'section' ); - $sectiontitle = $wgRequest->getText( 'sectiontitle' ); - $oid = $wgRequest->getInt( 'oldid' ); + + $fname = "Article::getContent"; + wfProfileIn( $fname ); if ( 0 == $this->getID() ) { if ( "edit" == $action ) { @@ -82,126 +80,60 @@ class Article { } wfProfileOut( $fname ); return wfMsg( "noarticletext" ); - } else { + } else { $this->loadContent( $noredir ); - - # size threshold at which pages are automatically collapsed - $collapsethreshold=$wgUser->getOption( "collapsethreshold" ); - if($collapsethreshold && strlen($this->mContent)>=$collapsethreshold) { - $collapse=true; - } else { - $collapse=false; - } - #override user pref is expansion is explicitly requested - if($wgRequest->getBool('collapse')) { $collapse=true; } - if( $wgRequest->getText( 'collapse' ) == 'false') { - $collapse=false; - } - if($oid) { $collapse=false; } - $wgOut->setCollapse($collapse); - - # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page - # if so, a "This is an anonymous talk page .." message must be appended to the - # displayed page (but not during editing!). - $anontalk=false; - if( ( $this->mTitle->getNamespace() == Namespace::getTalk( Namespace::getUser()) ) && - preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$this->mTitle->getText()) && - $action=="view" - ) { $anontalk=true; } - - # When a page is viewed in collapsed mode, only the intro section and, for - # pages with multiple sections, a table of contents are shown. - if($collapse && $action=="view" && $section=="") { - $rv=$this->getSection($this->mContent,0,$sectiontitle); - $wgOut->setToc(Parser::getTocFromSource($this->mContent)); - if($anontalk) { $rv = $rv . "\n" . wfMsg("anontalkpage"); } - wfProfileOut( $fname ); - return $rv; - } - # $section contains a section number and is used for section viewing and editing. - if($section!="") { - if($section=="new" && $action=="edit") { - wfProfileOut( $fname ); - return ""; - } - $rv=$this->getSection($this->mContent,$section,$sectiontitle); - if($anontalk) { $rv = $rv . "\n" . wfMsg("anontalkpage"); } - wfProfileOut( $fname ); - return $rv; - } - } - - if($anontalk) { return $this->mContent . "\n" . wfMsg("anontalkpage"); } - wfProfileOut( $fname ); - return $this->mContent; - - } - # This function returns the text of a section, specified by a number ($section) - # and a section title ($sectiontitle). A section is text under a heading like - # == Heading == or

Heading

, or the first section before any such - # heading (section 0). - # - # If a section contains subsections, these are also returned. - # - function getSection($text,$section,$sectiontitle) { - - # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML - # comments to be stripped as well) - $striparray=array(); - $parser=new Parser(); - $parser->mOutputType=OT_WIKI; - $striptext=$parser->strip($text, $striparray, true); - - # now that we can be sure that no pseudo-sections are in the source, - # split it up by section - $secs = - preg_split( - "/(^=+.*?=+|^.*?<\/h[1-6].*?" . ">)/mi", - $striptext, -1, - PREG_SPLIT_DELIM_CAPTURE); - if($section==0) { - $rv=$secs[0]; - } else { - $headline=$secs[$section*2-1]; - preg_match( "/^(=+).*?=+|^.*?<\/h[1-6].*?>/mi",$headline,$matches); - $hlevel=$matches[1]; - - # translate wiki heading into level - if(strpos($hlevel,"=")!==false) { - $hlevel=strlen($hlevel); - } - - $rv=$headline. $secs[$section*2]; - $count=$section+1; - - $break=false; - while(!empty($secs[$count*2-1]) && !$break) { - - $subheadline=$secs[$count*2-1]; - preg_match( "/^(=+).*?=+|^.*?<\/h[1-6].*?>/mi",$subheadline,$matches); - $subhlevel=$matches[1]; - if(strpos($subhlevel,"=")!==false) { - $subhlevel=strlen($subhlevel); - } - if($subhlevel > $hlevel) { - $rv.=$subheadline.$secs[$count*2]; - } - if($subhlevel <= $hlevel) { - $break=true; + if( + # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page + ( $this->mTitle->getNamespace() == Namespace::getTalk( Namespace::getUser()) ) && + preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$this->mTitle->getText()) && + $action=="view" + ) + { + wfProfileOut( $fname ); + return $this->mContent . "\n" .wfMsg("anontalkpagetext"); } + else { + if($action=="edit") { + if($section!="") { + if($section=="new") { + wfProfileOut( $fname ); + return ""; + } + + # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML + # comments to be stripped as well) + $striparray=array(); + $parser=new Parser(); + $parser->mOutputType=OT_WIKI; + $striptext=$parser->strip($this->mContent, $striparray, true); + + # now that we can be sure that no pseudo-sections are in the source, + # split it up by section + $secs = + preg_split( + "/(^=+.*?=+|^.*?<\/h[1-6].*?" . ">)/mi", + $striptext, -1, + PREG_SPLIT_DELIM_CAPTURE); + + if($section==0) { + $rv=$secs[0]; + } else { + $rv=$secs[$section*2-1] . $secs[$section*2]; + } + + # reinsert stripped tags + $rv=$parser->unstrip($rv,$striparray); + $rv=trim($rv); + wfProfileOut( $fname ); + return $rv; + } } - $count++; - + wfProfileOut( $fname ); + return $this->mContent; } } - # reinsert stripped tags - $rv=$parser->unstrip($rv,$striparray); - $rv=trim($rv); - return $rv; - } - - + # Load the revision (including cur_text) into this object function loadContent( $noredir = false ) { @@ -540,7 +472,7 @@ class Article { # If we got diff and oldid in the query, we want to see a # diff page instead of the article. - if ( !is_null( $diff ) ) { + if ( !is_null( $diff ) ) { $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); $de = new DifferenceEngine( intval($oldid), intval($diff) ); $de->showDiffPage(); @@ -672,7 +604,7 @@ class Article { /* Side effects: loads last edit */ function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ""){ $this->loadLastEdit(); - $oldtext = $this->getContent( true ); + $oldtext = $this->getContent( true ); if ($section != "") { if($section=="new") { if($summary) $subject="== {$summary} ==\n\n"; @@ -688,58 +620,15 @@ class Article { # now that we can be sure that no pseudo-sections are in the source, # split it up - # Unfortunately we can't simply do a preg_replace because that might - # replace the wrong section, so we have to use the section counter instead $secs=preg_split("/(^=+.*?=+|^.*?<\/h[1-6].*?" . ">)/mi", $oldtext,-1,PREG_SPLIT_DELIM_CAPTURE); $secs[$section*2]=$text."\n\n"; // replace with edited - - # section 0 is top (intro) section - if($section!=0) { - - # headline of old section - we need to go through this section - # to determine if there are any subsections that now need to - # be erased, as the mother section has been replaced with - # the text of all subsections. - $headline=$secs[$section*2-1]; - preg_match( "/^(=+).*?=+|^.*?<\/h[1-6].*?>/mi",$headline,$matches); - $hlevel=$matches[1]; - - # determine headline level for wikimarkup headings - if(strpos($hlevel,"=")!==false) { - $hlevel=strlen($hlevel); - } - - $secs[$section*2-1]=""; // erase old headline - $count=$section+1; - $break=false; - while(!empty($secs[$count*2-1]) && !$break) { - - $subheadline=$secs[$count*2-1]; - preg_match( - "/^(=+).*?=+|^.*?<\/h[1-6].*?>/mi",$subheadline,$matches); - $subhlevel=$matches[1]; - if(strpos($subhlevel,"=")!==false) { - $subhlevel=strlen($subhlevel); - } - if($subhlevel > $hlevel) { - // erase old subsections - $secs[$count*2-1]=""; - $secs[$count*2]=""; - } - if($subhlevel <= $hlevel) { - $break=true; - } - $count++; - - } - - } + if($section) { $secs[$section*2-1]=""; } // erase old headline $text=join("",$secs); + # reinsert the stuff that we stripped out earlier - $text=$parser->unstrip($text,$striparray); + $text=$parser->unstrip($text,$striparray,true); } - } return $text; } diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f5b71039e6..9bc9c9876c 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -375,10 +375,9 @@ $wgGoToEdit = false; # constructs. $wgUserHtml = true; -# $wgUseTidy: use tidy to make sure we produce valid XHTML output. -# tidy is a free tool that fixes broken HTML/transforms it into xhtml. -# When enabled, it does some of the cleaning/converting that's done in php otherwise -# Performace penalty on a long page: about 5%. +# $wgUseTidy: use tidy to make sure HTML output is sane. +# This should only be enabled if $wgUserHtml is true. +# tidy is a free tool that fixes broken HTML. # See http://www.w3.org/People/Raggett/tidy/ # $wgTidyBin should be set to the path of the binary and # $wgTidyConf to the path of the configuration file. diff --git a/includes/EditPage.php b/includes/EditPage.php index 3151ea06de..2c04c1fdbd 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -196,7 +196,7 @@ class EditPage { return; else $isConflict = true; - } + } } # First time through: get contents, set time for conflict # checking, etc. @@ -335,7 +335,7 @@ class EditPage { $previewhead.="

" . wfMsg( "previewconflict" ) . "

\n"; } - $previewtext = $this->textbox1; + $previewtext = wfUnescapeHTML( $this->textbox1 ); $parserOptions = ParserOptions::newFromUser( $wgUser ); $parserOptions->setUseCategoryMagic( false ); diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 5f553a328d..e859ed2229 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -18,8 +18,6 @@ class OutputPage { var $mParserOptions; var $mShowFeedLinks = false; var $mEnableClientCache = true; - var $mToc; # Table of contents for collapsed pages (in HTML) - var $mCollapse = false; # Collapse output? (Set in Article.php) function OutputPage() { @@ -37,7 +35,6 @@ class OutputPage { $this->mContainsOldMagic = $this->mContainsNewMagic = 0; $this->mParserOptions = ParserOptions::newFromUser( $temp = NULL ); $this->mSquidMaxage = 0; - $this->mToc=''; } function addHeader( $name, $val ) { array_push( $this->mHeaders, "$name: $val" ) ; } @@ -716,29 +713,5 @@ class OutputPage { # $ret .= ""; return $ret; } - - function setToc($toc) { - - $this->mToc=$toc; - - } - - function getToc() { - - return $this->mToc; - - } - - function setCollapse($collapse) { - - $this->mCollapse=$collapse; - - } - - function getCollapse() { - - return $this->mCollapse; - - } } ?> diff --git a/includes/Parser.php b/includes/Parser.php index dfba14d2b9..79aa4e7244 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -547,9 +547,7 @@ class Parser return $t ; } - // set isMain=false if you call from a template etc. and don't want to do stuff - // like TOC insertion for that content - function internalParse( $text, $linestart, $args = array(), $isMain=true ) + function internalParse( $text, $linestart, $args = array() ) { $fname = "Parser::internalParse"; wfProfileIn( $fname ); @@ -567,7 +565,7 @@ class Parser $text = $this->replaceExternalLinks( $text ); $text = $this->doTokenizedParser ( $text ); $text = $this->doTableStuff ( $text ) ; - $text = $this->formatHeadings( $text, $isMain ); + $text = $this->formatHeadings( $text ); $sk =& $this->mOptions->getSkin(); $text = $sk->transformContent( $text ); @@ -1509,8 +1507,7 @@ class Parser # Run full parser on the included text $text = $this->strip( $text, $this->mStripState ); - $text = $this->internalParse( $text, (bool)$newline, $assocArgs, false ); - if(!empty($newline)) $text = "\n".$text; + $text = $this->internalParse( $text, (bool)$newline, $assocArgs ); # Add the result to the strip state for re-inclusion after # the rest of the processing @@ -1675,12 +1672,10 @@ class Parser * */ - /* private */ function formatHeadings( $text, $isMain=true ) + /* private */ function formatHeadings( $text ) { - global $wgInputEncoding,$wgRequest,$wgOut; + global $wgInputEncoding; - $startsection=$wgRequest->getVal('section'); - if($startsection) { $startsection--;} $doNumberHeadings = $this->mOptions->getNumberHeadings(); $doShowToc = $this->mOptions->getShowToc(); if( !$this->mTitle->userCanEdit() ) { @@ -1812,12 +1807,12 @@ class Parser if ( empty( $head[$headlineCount] ) ) { $head[$headlineCount] = ""; } - $head[$headlineCount] .= $sk->editSectionLink($startsection+$headlineCount+1); + $head[$headlineCount] .= $sk->editSectionLink($headlineCount+1); } # Add the edit section span if( $rightClickHack ) { - $headline = $sk->editSectionScript($startsection+$headlineCount+1,$headline); + $headline = $sk->editSectionScript($headlineCount+1,$headline); } # give headline the correct tag @@ -1851,14 +1846,6 @@ class Parser # Top anchor now in skin $full = $full.$toc; } - - # If a page is viewed in collapsed mode, a TOC generated - # from the wikisource is stored in the title object. - # This TOC is now fetched and inserted here if it exists. - $collapsedtoc=$wgOut->getToc(); - if ($collapsedtoc && !$i && $isMain) { - $full = $full.$collapsedtoc; - } if( !empty( $head[$i] ) ) { $full .= $head[$i]; @@ -1869,115 +1856,6 @@ class Parser return $full; } - /* Generates a HTML-formatted table of contents which links to individual sections - from the wikisource. Used for collapsing long pages. - */ - /* static */ function getTocFromSource( $text ) { - - global $wgUser,$wgInputEncoding,$wgTitle,$wgOut,$wgParser; - $sk = $wgUser->getSkin(); - - $striparray=array(); - $oldtype=$wgParser->mOutputType; - $wgParser->mOutputType=OT_WIKI; - $text=$wgParser->strip($text, $striparray, true); - $wgParser->mOutputType=$oldtype; - - $numMatches = preg_match_all( "/^(=+)(.*?)=+|^(.*?)<\/h[1-6].*?>/mi",$text,$matches); - - # no headings: text cannot be collapsed - if( $numMatches == 0 ) { - return ""; - } - - # We combine the headlines into a bundle and convert them to HTML - # in order to make stripping out the wikicrap easier. - $combined=implode("!@@@!",$matches[2]); - $myout=$wgParser->parse($combined,$wgTitle,$wgOut->mParserOptions); - $combined_html=$myout->getText(); - $headlines=array(); - $headlines=explode("!@@@!",$combined_html); - - # headline counter - $headlineCount = 0; - $toclevel = 0; - $toc = ""; - $full = ""; - $head = array(); - $sublevelCount = array(); - $level = 0; - $prevlevel = 0; - foreach( $headlines as $headline ) { - $headline=trim($headline); - $numbering = ""; - if( $level ) { - $prevlevel = $level; - } - $level = $matches[1][$headlineCount]; - - # wikisource headings need to be converted into numbers - # =foo= equals

foo

, ==foo== equals

foo

etc. - if(strpos($level,"=")!==false) { - $level=strlen($level); - } - - if( $prevlevel && $level > $prevlevel ) { - # reset when we enter a new level - $sublevelCount[$level] = 0; - $toc .= $sk->tocIndent( $level - $prevlevel ); - $toclevel += $level - $prevlevel; - } - if( $level < $prevlevel ) { - # reset when we step back a level - $sublevelCount[$level+1]=0; - $toc .= $sk->tocUnindent( $prevlevel - $level ); - $toclevel -= $prevlevel - $level; - } - # count number of headlines for each level - @$sublevelCount[$level]++; - $dot = 0; - for( $i = 1; $i <= $level; $i++ ) { - if( !empty( $sublevelCount[$i] ) ) { - if( $dot ) { - $numbering .= "."; - } - $numbering .= $sublevelCount[$i]; - $dot = 1; - } - } - - - # The canonized header is a version of the header text safe to use for links - # Avoid insertion of weird stuff like by expanding the relevant sections - $state=array(); - $canonized_headline = Parser::unstrip( $headline, $state); - - # strip out HTML - $canonized_headline = preg_replace( "/<.*?" . ">/","",$canonized_headline ); - $tocline = trim( $canonized_headline ); - $canonized_headline = preg_replace("/[ \\?&\\/<>\\(\\)\\[\\]=,+']+/", '_', urlencode( do_html_entity_decode( $tocline, ENT_COMPAT, $wgInputEncoding ) ) ); - $refer[$headlineCount] = $canonized_headline; - - # count how many in assoc. array so we can track dupes in anchors - @$refers[$canonized_headline]++; - $refcount[$headlineCount]=$refers[$canonized_headline]; - $tocline = $numbering . " " . $tocline; - - # Create the anchor for linking from the TOC to the section - $anchor = trim($canonized_headline); - - if($refcount[$headlineCount] > 1 ) { - $anchor .= "_" . $refcount[$headlineCount]; - } - $headlineCount++; - $toc .= $sk->tocLine($anchor,$tocline,$toclevel,$headlineCount); - } - $toclines = $headlineCount; - $toc .= $sk->tocUnindent( $toclevel ); - $toc = $sk->tocTable( $toc ); - return $toc; - - } /* private */ function doMagicISBN( &$tokenizer ) { global $wgLang; diff --git a/includes/Skin.php b/includes/Skin.php index c74dabdf33..7b53b6ee3e 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -195,17 +195,26 @@ class Skin { { global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgOut, $wgRequest; - extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff', 'section','sectiontitle') ); - $collapse=$wgOut->getCollapse(); + extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) ); if ( 0 != $wgTitle->getNamespace() ) { $a = array( "bgcolor" => "#ffffec" ); } else $a = array( "bgcolor" => "#FFFFFF" ); - if($wgOut->isArticle() && $wgUser->getOption("editondblclick")) { - $s = $this->editThisPage(false); + if($wgOut->isArticle() && $wgUser->getOption("editondblclick") && + (!$wgTitle->isProtected() || $wgUser->isSysop()) ) { + $t = wfMsg( "editthispage" ); + $oid = $red = ""; + if ( !empty($redirect) ) { + $red = "&redirect={$redirect}"; + } + if ( !empty($oldid) && ! isset( $diff ) ) { + $oid = "&oldid={$oldid}"; + } + $s = $wgTitle->getFullURL( "action=edit{$oid}{$red}" ); $s = "document.location = \"" .$s ."\";"; $a += array ("ondblclick" => $s); + } $a['onload'] = $wgOut->getOnloadHandler(); return $a; @@ -515,17 +524,9 @@ class Skin { function pageTitle() { - global $wgOut, $wgTitle, $wgUser, $wgRequest; - $section=$wgRequest->getVal('section'); - $action=$wgRequest->getVal('action'); - - if ($section && $action=="view") { - $link= $this->makeLink( $wgTitle->getPrefixedText(), htmlspecialchars($wgOut->getPageTitle()) ); - $s = "

" . $link . " " . wfMsg("sectionedit")."

"; - } else { - - $s = "

" . htmlspecialchars( $wgOut->getPageTitle() ) . "

"; - } + global $wgOut, $wgTitle, $wgUser; + + $s = "

" . htmlspecialchars( $wgOut->getPageTitle() ) . "

"; if($wgUser->getOption("editsectiononrightclick") && $wgTitle->userCanEdit()) { $s=$this->editSectionScript(0,$s);} return $s; } @@ -1104,19 +1105,15 @@ class Skin { return $s; } - # if makeLink is false, just return the edit URL - function editThisPage($makeLink=true) + function editThisPage() { global $wgOut, $wgTitle, $wgRequest; $oldid = $wgRequest->getVal( 'oldid' ); $diff = $wgRequest->getVal( 'diff' ); $redirect = $wgRequest->getVal( 'redirect' ); - $section = $wgRequest->getVal('section'); - $sectiontitle = $wgRequest->getVal('sectiontitle'); - $collapse = $wgOut->getCollapse(); - if ( ! $wgOut->isArticleRelated() && $makeLink) { + if ( ! $wgOut->isArticleRelated() ) { $s = wfMsg( "protectedpage" ); } else { $n = $wgTitle->getPrefixedText(); @@ -1126,27 +1123,13 @@ class Skin { #$t = wfMsg( "protectedpage" ); $t = wfMsg( "viewsource" ); } - $oid = $red = $sid = $stl = ""; + $oid = $red = ""; if ( !is_null( $redirect ) ) { $red = "&redirect={$redirect}"; } if ( $oldid && ! isset( $diff ) ) { $oid = "&oldid={$oldid}"; } - if ( !empty($section) ) { - $sid = "§ion={$section}"; - } - if ( !empty($sectiontitle) ) { - $stl = "§iontitle={$sectiontitle}"; - } - if ($collapse && !$section) { - $sid = "§ion=0"; - } - $action="action=edit{$oid}{$red}{$sid}{$stl}"; - if($makeLink) { - $s = $this->makeKnownLink( $n, $t, $action ); - } else { - $s = $wgTitle->getFullUrl($action); - } + $s = $this->makeKnownLink( $n, $t, "action=edit{$oid}{$red}" ); } return $s; } @@ -2498,11 +2481,8 @@ class Skin { } # parameter level defines if we are on an indentation level - function tocLine( $anchor, $tocline, $level,$section=0 ) { - global $wgTitle; - $url = $section ? $wgTitle->getLocalURL( "action=view§ion={$section}§iontitle={$anchor}" ) - : "#$anchor"; - $link = "$tocline
"; + function tocLine( $anchor, $tocline, $level ) { + $link = "$tocline
"; if($level) { return "$link\n"; } else { @@ -2514,31 +2494,13 @@ class Skin { function tocTable($toc) { # note to CSS fanatics: putting this in a div does not work -- div won't auto-expand # try min-width & co when somebody gets a chance - global $wgRequest,$wgTitle,$wgOut; - $collapse=$wgOut->getCollapse(); - $section=$wgRequest->getVal('section'); - $collapseexpand=""; - if(!$section) { - if($collapse) { - $url=$wgTitle->getLocalURL("action=view&collapse=false"); - $collapseexpand="".wfMsg("expandpage").""; - } else { - $url=$wgTitle->getLocalURL("action=view&collapse=true"); - $collapseexpand="".wfMsg("collapsepage").""; - } - } $hideline = " "; - $rv= + return ""; - if($collapseexpand) { - $rv.=""; - } - $rv.="
\n". "".wfMsg("toc")."" . $hideline . "
\n". - $toc."
$collapseexpand
\n"; - return $rv; + $toc."\n"; } # These two do not check for permissions: check $wgTitle->userCanEdit before calling them diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php index 40feac6c41..fa0dcbfa5e 100644 --- a/includes/SkinPHPTal.php +++ b/includes/SkinPHPTal.php @@ -87,12 +87,7 @@ $this->titletxt = $wgTitle->getPrefixedText(); - $title=$wgOut->getPageTitle(); - $section=$wgRequest->getVal('section'); - if ($section && $action=="view") { - $title .= " " . wfMsg("sectionedit"); - } - $tpl->set( "title", $title ); + $tpl->set( "title", $wgOut->getPageTitle() ); $tpl->set( "pagetitle", $wgOut->getHTMLTitle() ); $tpl->setRef( "thispage", &$this->thispage ); @@ -292,13 +287,10 @@ # an array of edit links by default used for the tabs function buildContentActionUrls () { - global $wgTitle, $wgUser, $wgRequest,$wgOut; + global $wgTitle, $wgUser, $wgRequest; $action = $wgRequest->getText( 'action' ); $section = $wgRequest->getText( 'section' ); $oldid = $wgRequest->getVal( 'oldid' ); - $section = $wgRequest->getVal( 'section' ); - $sectiontitle = $wgRequest->getVal( 'sectiontitle' ); - $collapse = $wgOut->getCollapse(); $diff = $wgRequest->getVal( 'diff' ); $content_actions = array(); @@ -335,16 +327,12 @@ if ( $wgTitle->userCanEdit() ) { $oid = ( $oldid && ! isset( $diff ) ) ? "&oldid={$oldid}" : false; - - $sid = $section ? "§ion={$section}" : false; - $stl = $sectiontitle ? "§iontitle={$sectiontitle}" : false; - if($collapse && !$sid) { $sid="§ion=0";} $istalk = ( Namespace::isTalk( $wgTitle->getNamespace()) ); $istalkclass = $istalk?' istalk':''; $content_actions['edit'] = array( 'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass, 'text' => wfMsg('edit'), - 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid.$sid.$stl), + 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid), 'ttip' => wfMsg('tooltip-edit'), 'akey' => wfMsg('accesskey-edit') ); @@ -359,12 +347,9 @@ } } else { $oid = ( $oldid && ! isset( $diff ) ) ? "&oldid={$oldid}" : ''; - $sid = $section ? "§ion={$section}" : false; - $stl = $sectiontitle ? "§iontitle={$sectiontitle}" : false; - if($collapse && !$sid) { $sid="§ion=0";} $content_actions['edit'] = array('class' => ($action == 'edit') ? 'selected' : false, 'text' => wfMsg('viewsource'), - 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid.$sid.$stl), + 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid), 'ttip' => wfMsg('tooltip-viewsource'), 'akey' => wfMsg('accesskey-viewsource')); } diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index ea495dc9b2..ba649eaa49 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -22,7 +22,6 @@ class PreferencesForm { $this->mNewpass = $request->getVal( 'wpNewpass' ); $this->mRetypePass =$request->getVal( 'wpRetypePass' ); $this->mStubs = $request->getVal( 'wpStubs' ); - $this->mCollapse = $request->getVal( 'wpCollapse' ); $this->mRows = $request->getVal( 'wpRows' ); $this->mCols = $request->getVal( 'wpCols' ); $this->mSkin = $request->getVal( 'wpSkin' ); @@ -159,7 +158,6 @@ class PreferencesForm { $wgUser->setOption( "rows", $this->validateInt( $this->mRows, 4, 1000 ) ); $wgUser->setOption( "cols", $this->validateInt( $this->mCols, 4, 1000 ) ); $wgUser->setOption( "stubthreshold", $this->validateIntOrNull( $this->mStubs ) ); - $wgUser->setOption( "collapsethreshold", $this->validateIntOrNull( $this->mCollapse ) ); $wgUser->setOption( "timecorrection", $this->validateTimeZone( $this->mHourDiff, -12, 14 ) ); # Set search namespace options @@ -199,7 +197,6 @@ class PreferencesForm { $this->mRows = $wgUser->getOption( "rows" ); $this->mCols = $wgUser->getOption( "cols" ); $this->mStubs = $wgUser->getOption( "stubthreshold" ); - $this->mCollapse = $wgUser->getOption( "collapsethreshold" ); $this->mHourDiff = $wgUser->getOption( "timecorrection" ); $this->mSearch = $wgUser->getOption( "searchlimit" ); $this->mSearchLines = $wgUser->getOption( "contextlines" ); @@ -314,7 +311,6 @@ class PreferencesForm { $emf = wfMsg( "emailflag" ); $ynn = wfMsg( "yournick" ); $stt = wfMsg ( "stubthreshold" ) ; - $coltr = wfMsg("collapsethreshold"); $srh = wfMsg( "searchresultshead" ); $rpp = wfMsg( "resultsperpage" ); $scl = wfMsg( "contextlines" ); @@ -443,7 +439,6 @@ class PreferencesForm { " . $this->getToggle( "hideminor" ) . $this->getToggle( "usenewrc" ) . "
-
diff --git a/includes/Title.php b/includes/Title.php index 55248c6eff..255cc157bc 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -38,7 +38,7 @@ class Title { $this->mNamespace = 0; $this->mRestrictionsLoaded = false; $this->mRestrictions = array(); - $this->mDefaultNamespace = 0; + $this->mDefaultNamespace = 0; } # From a prefixed DB key @@ -1139,6 +1139,6 @@ class Title { Article::onArticleCreate( $this ); return true; } - + } ?> diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 593ca78f1c..bcec3c05fc 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -101,9 +101,7 @@ class WebRequest { } function getBool( $name, $default = false ) { - $val=$this->getVal( $name, $default ); - if($val=="false") { $val=false; } - return $val ? true : false; + return $this->getVal( $name, $default ) ? true : false; } function getCheck( $name ) { diff --git a/languages/Language.php b/languages/Language.php index 4aa2336391..ca5024436f 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -49,7 +49,7 @@ if($wgMetaNamespace === FALSE) "cols" => 80, "rows" => 25, "searchlimit" => 20, "contextlines" => 5, "contextchars" => 50, "skin" => $wgDefaultSkin, "math" => 1, "rcdays" => 7, "rclimit" => 50, - "highlightbroken" => 1, "stubthreshold" => 0, "collapsethreshold" => 30000, + "highlightbroken" => 1, "stubthreshold" => 0, "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1, "showtoolbar" =>1, "date" => 0 @@ -569,8 +569,6 @@ performed by sysops with \"bureaucrat\" status.", "toc" => "Table of contents", "showtoc" => "show", "hidetoc" => "hide", -"collapsepage" => "Collapse page", -"expandpage" => "Expand page", "thisisdeleted" => "View or restore $1?", "restorelink" => "$1 deleted edits", 'feedlinks' => 'Feed:', @@ -944,8 +942,7 @@ See [[{{ns:4}}:User preferences help]] for help deciphering the options.", "resultsperpage" => "Hits to show per page", "contextlines" => "Lines to show per hit", "contextchars" => "Characters of context per line", -"stubthreshold" => "Threshold (in bytes) for marking links as stubs", -"collapsethreshold" => "Threshold (in bytes) for auto-collapsing pages", +"stubthreshold" => "Threshold for stub display", "recentchangescount" => "Number of titles in recent changes", "savedprefs" => "Your preferences have been saved.", "timezonetext" => "Enter number of hours your local time differs