[Fusionforge-commits] FusionForge branch master updated. 7b806dd051d0cb2e161529263fe6cae1cd1d4410

Alain Peyrat aljeux at fusionforge.org
Thu Nov 22 21:07:03 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  7b806dd051d0cb2e161529263fe6cae1cd1d4410 (commit)
      from  cc660d52509b80c3b1fcc7f4898b340c3fe8c89f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b806dd051d0cb2e161529263fe6cae1cd1d4410
Author: Alain Peyrat <aljeux at free.fr>
Date:   Thu Nov 22 21:06:54 2012 +0100

    Fix empty scm_box (i.e. scm host)

diff --git a/src/www/register/index.php b/src/www/register/index.php
index 050f538..0e6ca97 100644
--- a/src/www/register/index.php
+++ b/src/www/register/index.php
@@ -97,6 +97,9 @@ if (getStringFromRequest('submit')) {
 				$scm_host = $plugin->getDefaultServer();
 			}
 		}
+		if (! $scm_host) {
+			$scm_host = forge_get_config('scm_host');
+		}
 	}
 
 	if ( !$purpose && forge_get_config ('project_auto_approval') ) {
diff --git a/src/www/scm/admin/index.php b/src/www/scm/admin/index.php
index bc02843..9f15e32 100644
--- a/src/www/scm/admin/index.php
+++ b/src/www/scm/admin/index.php
@@ -59,7 +59,7 @@ if (getStringFromRequest('create_repository')) {
 		$hook_params['description'] = $description;
 		$hook_params['clone'] = $clone;
 		$hook_params['error_msg'] = '';
-		plugin_hook_by_reference ('scm_add_repo', $hook_params);
+		plugin_hook_by_reference('scm_add_repo', $hook_params);
 		if ($hook_params['error_msg']) {
 			$error_msg = $hook_params['error_msg'];
 		}
@@ -99,6 +99,9 @@ elseif (getStringFromRequest('submit')) {
 			$myPlugin = plugin_get_object($plugin);
 			if ($scmradio == $myPlugin->name) {
 				$group->setPluginUse($myPlugin->name, 1);
+				if ($myPlugin->getDefaultServer()) {
+					$group->setSCMBox($myPlugin->getDefaultServer());
+				}
 			} else {
 				$group->setPluginUse($myPlugin->name, 0);
 			}

-----------------------------------------------------------------------

Summary of changes:
 src/www/register/index.php  |    3 +++
 src/www/scm/admin/index.php |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list