Changeset 121

Timestamp:

09/21/2008 12:28:47 PM (4 years ago)

Author:

admin

Message:

• changed wikiSuggestLocation in bookmarks to look at OMWIKI_SCRIPT_PATH variable for /w or /wiki location of JSON web service
• increased version number

Index: D:/Tech/Eclipse/workspace/omcollab/bookmarks/config.inc.php
===================================================================
--- D:/Tech/Eclipse/workspace/omcollab/bookmarks/config.inc.php (revision 114)
+++ D:/Tech/Eclipse/workspace/omcollab/bookmarks/config.inc.php (working copy)
@@ -70,7 +70,8 @@

$mwdbname = OMWIKI_DATABASE_NAME;
$mwtableprefix = OMWIKI_DB_TABLE_PREFIX;
$targetserverlocation = " http://{$_SERVER['HTTP_HOST']}" . RR_OMCOLLAB_DIRECTORY . "bookmarks/tags.php/";

-$wikiSuggestLocation = " http://{$_SERVER['HTTP_HOST']}" . RR_OMCOLLAB_DIRECTORY . "wiki/extensions/SelectCategoryTagCloud/SelectCategoryTagCloudSuggestJSON.php";
+$wikiSuggestLocation = " http://{$_SERVER['HTTP_HOST']}" . OMWIKI_SCRIPT_PATH . "/extensions/SelectCategoryTagCloud/SelectCategoryTagCloudSuggestJSON.php";
+

$mwdbtype = 'mysql';
$mwdbport = '3306';
$mwcookiename = "{$mwdbname}_{$mwtableprefix}";

Index: D:/Tech/Eclipse/workspace/omcollab/_InstallationResources/omconfig.php
===================================================================
--- D:/Tech/Eclipse/workspace/omcollab/_InstallationResources/omconfig.php (revision 114)
+++ D:/Tech/Eclipse/workspace/omcollab/_InstallationResources/omconfig.php (working copy)
@@ -37,7 +37,7 @@

}

# [ omCollab Version - increment manually - will appear as title on omCollab logo]

-define( 'OMCOLLAB_VERSION' , '1.003.0' );
+define( 'OMCOLLAB_VERSION' , '1.003.2' );

# [ ... ]
define( 'OMCOLLAB_HTTP_HOST' , $_SERVERHTTP_HOST? );

Location:

trunk

Files:

• _InstallationResources/omconfig.php (modified) (1 diff)
• bookmarks/config.inc.php (modified) (1 diff)

trunk/_InstallationResources/omconfig.php

@@ -38 +38 @@
 
 # [ omCollab Version - increment manually - will appear as title on omCollab logo]
-define( 'OMCOLLAB_VERSION'                         , '1.003.0' );
+define( 'OMCOLLAB_VERSION'                         , '1.003.2' );
 
 # [ ... ]

trunk/bookmarks/config.inc.php

@@ -71 +71 @@
 $mwtableprefix                  = OMWIKI_DB_TABLE_PREFIX;
 $targetserverlocation   = "http://{$_SERVER['HTTP_HOST']}" . RR_OMCOLLAB_DIRECTORY . "bookmarks/tags.php/";
-$wikiSuggestLocation    = "http://{$_SERVER['HTTP_HOST']}" . RR_OMCOLLAB_DIRECTORY . "wiki/extensions/SelectCategoryTagCloud/SelectCategoryTagCloudSuggestJSON.php";
+$wikiSuggestLocation    = "http://{$_SERVER['HTTP_HOST']}" . OMWIKI_SCRIPT_PATH . "/extensions/SelectCategoryTagCloud/SelectCategoryTagCloudSuggestJSON.php";
+
 $mwdbtype               = 'mysql';
 $mwdbport               = '3306';