Changeset 1385 for branches/omcollab_zhongzhen2/wiki

Timestamp:

02/25/2010 09:36:45 AM (2 years ago)

Author:

Xiping.Wang

Message:

[omcollab_zhongzhen2] sync with trunk

Location:

branches/omcollab_zhongzhen2

Files:

• . (modified) (1 prop)
• wiki (modified) (1 prop)
• wiki/LocalSettings.php (modified) (2 diffs)
• wiki/extensions/SocialProfile/UserBoard/SpecialUserBoard.php (modified) (1 diff)

branches/omcollab_zhongzhen2/wiki/LocalSettings.php

@@ -157 +157 @@
 $wgEnableUploads     = true;
 $wgUploadBaseUrl     = $wgServer;
-$wgFileExtensions    = array( 'png', 'gif', 'jpg', 'jpeg', 'doc', 'pdf', 'xls', 'ppt', 'docx','xlsx','pptx','zip');
+$wgFileExtensions    = array( 'png', 'gif', 'jpg', 'jpeg', 'doc', 'pdf', 'xls', 'ppt', 'docx','xlsx','pptx','zip','svg');
 
 # [ extensions ]
@@ -310 +310 @@
 // Add top contributors per article
 require_once("$IP/extensions/awc/top_ten/top_ten.php");
+
+
+// xiping.wang@gmail.com 2010-02-24 
+// Replace svg convert from ImageMagick to librsvg
+// $wgSVGConverter = 'rsvg';

branches/omcollab_zhongzhen2/wiki/extensions/SocialProfile/UserBoard/SpecialUserBoard.php

@@ -116 +116 @@
                         var posted = 0;
                         function send_message(){
+                                if(jQuery) jQuery.noConflict();
                                 if(\$(\"message\").value && !posted){
                                         posted = 1;