[Fusionforge-commits] FusionForge branch master updated. 88c5d95fa9eac35fed0960252d7a941a38e85b28

Roland Mas lolando at fusionforge.org
Fri Dec 5 14:43:44 CET 2014


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  88c5d95fa9eac35fed0960252d7a941a38e85b28 (commit)
      from  a00cc25c971ab18ab347a4875423999f16bb8fed (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 88c5d95fa9eac35fed0960252d7a941a38e85b28
Author: Roland Mas <lolando at debian.org>
Date:   Fri Dec 5 14:43:39 2014 +0100

    Fixed frames for viewvc

diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index e67b68d..35d4ce0 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -263,7 +263,7 @@ some control over it to the project's administrator.");
 		}
 
 		if ($project->usesPlugin($this->name)) {
-				print '<iframe id="scmsvn_iframe" src="'.util_make_url("/scm/viewvc.php/?inframe=1&root=".$project->getUnixName()).'" frameborder="0" width=100% ></iframe>';
+				print '<iframe id="scmsvn_iframe" src="'.util_make_url("/scm/viewvc.php?inframe=1&root=".$project->getUnixName()).'" frameborder="0" width=100% ></iframe>';
 				$useautoheight = 1;
         }
 
diff --git a/src/www/scm/browser.php b/src/www/scm/browser.php
index f65e006..6015d1e 100644
--- a/src/www/scm/browser.php
+++ b/src/www/scm/browser.php
@@ -28,8 +28,7 @@ require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'scm/include/scm_utils.php';
 
 $group_id = getIntFromRequest("group_id");
-scm_header(array('title'=>_('SCM Repository'),'group'=>$group_id,
-'inframe'=>getIntFromGet('inframe')));
+scm_header(array('title'=>_('SCM Repository'),'group'=>$group_id));
 
 $repo_name = getStringFromRequest("repo_name", "none");
 $user_id = getIntFromRequest("user_id");
@@ -42,4 +41,4 @@ $hook_params['user_id'] = $user_id;
 $hook_params['commit'] = $commit_id;
 plugin_hook ("scm_browser_page", $hook_params);
 
-scm_footer(array('inframe'=>getIntFromGet('inframe')));
+scm_footer();
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 3f7be8c..dd14dbf 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -170,7 +170,6 @@ switch ($_GET['view']) {
 			}
 		}
 		echo $body;
-		break;
 	}
 	default: {
 		// If we output html and we found the mbstring extension, we
@@ -178,19 +177,13 @@ switch ($_GET['view']) {
 		if ($charset != 'UTF-8' && extension_loaded('mbstring'))
 			$body = mb_convert_encoding($body, 'UTF-8', $encoding);
 		scm_header(array('title'=>_("SCM Repository"),
-			'group'=>$Group->getID()));
+						 'group'=>$Group->getID(),
+						 'inframe'=>1));
 		echo $body;
-		scm_footer();
-		break;
+		scm_footer(array('inframe'=>1));
 	}
 }
 
-scm_header(array('title'=>_("SCM Repository"),
-				 'group'=>$Group->getID(),
-				 'inframe'=>getIntFromGet('inframe')));
-echo $content;
-scm_footer(array('inframe'=>getIntFromGet('inframe')));
-
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

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

Summary of changes:
 src/plugins/scmsvn/common/SVNPlugin.class.php |    2 +-
 src/www/scm/browser.php                       |    5 ++---
 src/www/scm/viewvc.php                        |   13 +++----------
 3 files changed, 6 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list