From: Gary Cunningham-L. <ga...@cu...> - 2011-02-19 09:31:23
|
Thanks, Changi. I committed again to restore the accents, and hope it's ok now. -- Gary Jean-François B. wrote: > I think you broke all accent stuff just below your modification. > > Changi > > Le 19/02/2011 07:04, chi...@us... a écrit : > >> Revision: 32917 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32917&view=rev >> Author: chibaguy >> Date: 2011-02-19 06:04:52 +0000 (Sat, 19 Feb 2011) >> >> Log Message: >> ----------- >> [MOD] Wikitext heading sizes are consistent (to the relief of designers) regardless of whether "display page name as page title" is activated or not (previously, headings were shifted downward when the option was activated). HTML5 can tolerate multiple h1 headings per page. Site admins/authors should be aware to not use more than one h1 per CSS section element. >> >> Modified Paths: >> -------------- >> trunk/lib/tikilib.php >> >> Modified: trunk/lib/tikilib.php >> =================================================================== >> --- trunk/lib/tikilib.php 2011-02-19 05:35:43 UTC (rev 32916) >> +++ trunk/lib/tikilib.php 2011-02-19 06:04:52 UTC (rev 32917) >> @@ -6165,13 +6165,6 @@ >> $button = ''; >> } >> >> - // Use $hdrlevel + 1 because the page title is H1, so none of the other headers should be. >> - // Except when page title is off >> - // Or when in wysiwyg mode >> - $headerInc = 0; >> - if( $prefs['feature_page_title'] == 'y'&& ! $options['noheaderinc'] ) >> - ++$headerInc; >> - >> if ( $prefs['feature_wiki_show_hide_before'] == 'y' ) { >> $line = $button.'<h'.($hdrlevel+$headerInc).' class="showhide_heading" id="'.$thisid.'">'.$aclose.' '.$title_text.'</h'.($hdrlevel+$headerInc).'>'.$aclose2; >> } else { >> @@ -7861,7 +7854,7 @@ >> } >> >> function take_away_accent($str) { >> - $accents = explode(' ', 'À Á Â Ã Ä Å Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö Ù Ú Û Ü Ý ß à á â ã ä å ç è é ê ë ì í î ï ñ ò ó ô õ ö ù ú û ü ý Æ æ'); >> + $accents = explode(' ', 'À ÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEÁEà á â ã ä å ç è é ê ë ì í î ï ñ ò ó ô õ ö ù ú û ü ý ÁEæ'); >> $convs = explode(' ', 'A A A A A A C E E E E I I I I D N O O O O O U U U U Y s a a a a a a c e e e e i i i i n o o o o o u u u u y AE ae'); >> return str_replace($accents, $convs, $str); >> } >> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: >> Pinpoint memory and threading errors before they happen. >> Find and fix more than 250 security defects in the development cycle. >> Locate bottlenecks in serial and parallel code that limit performance. >> http://p.sf.net/sfu/intel-dev2devfeb >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > ------------------------------------------------------------------------------ > The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: > Pinpoint memory and threading errors before they happen. > Find and fix more than 250 security defects in the development cycle. > Locate bottlenecks in serial and parallel code that limit performance. > http://p.sf.net/sfu/intel-dev2devfeb > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ----- > No virus found in this message. > Checked by AVG - www.avg.com > Version: 10.0.1204 / Virus Database: 1435/3452 - Release Date: 02/18/11 > |