[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 986e3adadc7e58a180e6fbc4261e1c93b7b47d7b

Thorsten Glaser mirabilos at fusionforge.org
Thu May 23 12:40:24 CEST 2013


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, Branch_5_2 has been updated
       via  986e3adadc7e58a180e6fbc4261e1c93b7b47d7b (commit)
       via  6ff4b83f504ce32865e12e9ae232caf7e11d2b35 (commit)
       via  772c2c838dde4a5849dd311c4574c9f2271f30bf (commit)
       via  aa5f6def91ffd728ffc6d9f23c7ac7d870050989 (commit)
       via  6b479259b861288b4762a40e3e23ffa4dfcfca57 (commit)
       via  1f5bd625f047460bdab87f87df9dd0ba25a4e9be (commit)
       via  4352deeda8d531f14f41fe1ff69a8f399665ba55 (commit)
      from  105ee402584285171889899a6d373b0067b10f0f (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 986e3adadc7e58a180e6fbc4261e1c93b7b47d7b
Merge: 105ee40 6ff4b83
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Thu May 23 12:40:18 2013 +0200

    Merge branch 'Branch_5_1' into Branch_5_2
    
    Conflicts:
    	src/www/admin/index.php

diff --cc src/plugins/mediawiki/cronjobs/create-wikis.php
index dfabb4c,72f9463..8f4c59f
--- a/src/plugins/mediawiki/cronjobs/create-wikis.php
+++ b/src/plugins/mediawiki/cronjobs/create-wikis.php
@@@ -133,17 -126,11 +133,18 @@@ while ( $row = db_fetch_array($project_
  
  		cron_debug("  Creating project dir $project_dir.");
  		mkdir($project_dir, 0775, true);
+ 		chmod($project_dir, 0775);
  
 +		$f = fopen("$project_dir/ProjectSettings.php", "w");
 +		fwrite($f, '<?php
 +// Insert your project-local configuration here
 +');
 +		fclose($f);
 +		chmod("$project_dir/ProjectSettings.php", 0775);
 +
  		$mwwrapper = forge_get_config('source_path')."/plugins/mediawiki/bin/mw-wrapper.php" ;
  		$dumpfile = forge_get_config('config_path')."/mediawiki/initial-content.xml" ;
 -		
 +
  		if (file_exists ($dumpfile)) {
  			system ("$mwwrapper $project importDump.php $dumpfile") ;
  			system ("$mwwrapper $project rebuildrecentchanges.php") ;

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

Summary of changes:
 src/common/widget/Widget_MyAdmin.class.php      |    7 ++-
 src/deb-specific/create-mailing-lists.pl        |    2 +-
 src/plugins/mediawiki/bin/mw-fulldump           |   55 +++++++++++++++++++++++
 src/plugins/mediawiki/bin/mw-fullrestore        |   52 +++++++++++++++++++++
 src/plugins/mediawiki/bin/mw-plugin-init.php    |    2 +
 src/plugins/mediawiki/cronjobs/create-wikis.php |    1 +
 src/plugins/mediawiki/www/LocalSettings.php     |    2 +-
 src/www/admin/index.php                         |   26 +++++++----
 8 files changed, 135 insertions(+), 12 deletions(-)
 create mode 100644 src/plugins/mediawiki/bin/mw-fulldump
 create mode 100644 src/plugins/mediawiki/bin/mw-fullrestore


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list