Changeset 1385 for branches/omcollab_zhongzhen2/_InstallationResources

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)
• _InstallationResources (modified) (1 prop)
• _InstallationResources/UserProfilePage.js (modified) (4 diffs)
• _InstallationResources/UserRelationship.js (modified) (1 diff)
• _InstallationResources/omforum_migration_13100_13200.sql (modified) (1 diff)

branches/omcollab_zhongzhen2/_InstallationResources/UserProfilePage.js

@@ -41 +41 @@
 
 function uploadError(message){
+        if(jQuery) jQuery.noConflict();
         $('mini-gallery-' + replaceID).innerHTML = oldHtml;
         $('upload-frame-errors').innerHTML = message;
@@ -49 +50 @@
 
 function textError(message){
+        if(jQuery) jQuery.noConflict();
         $('upload-frame-errors').innerHTML = message;
         new YAHOO.widget.Effects.Show('upload-frame-errors');
@@ -54 +56 @@
 
 function completeImageUpload(){
+        if(jQuery) jQuery.noConflict();
         new YAHOO.widget.Effects.Hide('upload-frame-errors');
         $('upload-frame-errors').innerHTML = '';
@@ -71 +74 @@
 
 function uploadComplete(imgSrc, imgName, imgDesc){
+        if(jQuery) jQuery.noConflict();
         replaceSrc = imgSrc;
 

branches/omcollab_zhongzhen2/_InstallationResources/UserRelationship.js

@@ -1 +1 @@
         function requestResponse(response,id){
+                if(jQuery) jQuery.noConflict();
                 var url = "{omwiki_script_path}/index.php?action=ajax";
                 var pars = 'rs=wfRelationshipRequestResponse&rsargs[]=' + response + '&rsargs[]=' + id

branches/omcollab_zhongzhen2/_InstallationResources/omforum_migration_13100_13200.sql

@@ -2 +2 @@
 -- Added by zhongzhen newely
 -- 
+update om_config
+   set config_value=1,is_dynamic=1
+ where config_name = 'load_tplcompile';
+
 
 INSERT INTO `om_styles` VALUES (4,'mike2green','© omCollab, 2008',1,4,4,4);