Changeset 1798 for trunk/w

Timestamp:

08/17/2010 12:21:25 PM (21 months ago)

Author:

Xiping.Wang

Message:

[trunk]merged from trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• w (modified) (1 prop)
• w/LocalSettings.php (modified) (1 diff)
• w/extensions/omCollabSingleSignon.php (modified) (2 diffs)
• w/includes/specials/SpecialDocConvert.php (modified) (1 diff)
• w/skins/Mike2.php (modified) (2 diffs)

trunk/w/LocalSettings.php

@@ -322 +322 @@
  */
 //$wgDefaultUserOptions['riched_start_disabled']=false;
+$wgDefaultUserOptions['cols']=65; // Added by zhongzhen to decrease textarea box width in wiki Edit page on 2010-08-16.
 
 

trunk/w/extensions/omCollabSingleSignon.php

@@ -215 +215 @@
         setcookie( $sPassCookie, md5( md5( $_POST['wpPassword'] ) ), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'blogs/' );
     
-        setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . '/' );
+        
+        setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY);
         setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'home/' );
         setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'wiki/' );
@@ -298 +299 @@
 
         // omExplore                                                                        
-        setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . '/' );
+        setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY );
         setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'home/' );            
     setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'wiki/' );

trunk/w/includes/specials/SpecialDocConvert.php

@@ -169 +169 @@
                                 
                                 $wgOut->addHTML("Your document was converted successfully.  Please press Preview below to preview and save the page.<br /><br />");
+                                // Edited by zhongzhen on 2010-08-16. cols value was changed from 80 to 65
                                 $wgOut->addHTML("
                                         <form id='editform' name='editform' method='post' action='$title' enctype='multipart/form-data'>
-                                        <textarea tabindex='1' accesskey=',' name='wpTextbox1' id='wpTextbox1' rows='25' cols='80' >$mediaWikiTxtData</textarea>
+                                        <textarea tabindex='1' accesskey=',' name='wpTextbox1' id='wpTextbox1' rows='25' cols='65' >$mediaWikiTxtData</textarea>
                                         <input id='wpPreview' name='wpPreview' type='submit' tabindex='4' value='Show preview' accesskey='p' title='Preview your changes, please use this before saving! [p]' />
                                         </form>

trunk/w/skins/Mike2.php

@@ -111 +111 @@
                         <?php
                         # Allow MediaWiki:Sidebar article to be wikitext
-                        /*global $wgUser,$wgTitle,$wgParser;
+                        global $wgUser,$wgTitle,$wgParser;
                         $side = new Article(Title::newFromText('Sidebar',NS_MEDIAWIKI));
                         if (is_object($wgParser)) { $psr = $wgParser; $opt = $wgParser->mOptions; }
@@ -117 +117 @@
                         if (!is_object($opt)) $opt = ParserOptions::newFromUser($wgUser);
                         $html = $psr->parse($side->fetchContent(),$wgTitle,$opt,true,true)->getText();
-                        echo preg_replace("/<li>\\s*<\\/li>/",'',$html);*/ ?>
+                        echo preg_replace("/<li>\\s*<\\/li>/",'',$html); ?>
                         <!-- Submenu End -->