[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 3884fb39e76c897634a255310661099900e5913a

Thorsten Glaser mirabilos at fusionforge.org
Fri Jan 9 14:28:36 CET 2015


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  3884fb39e76c897634a255310661099900e5913a (commit)
       via  14f31c3d417f3fbc143c940cc88967467f860288 (commit)
       via  ea43cf19adbb4b6bf5037765cf33305f7f17e639 (commit)
      from  d76ee301765d06780639647a0bb79e35dae4ffc9 (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 3884fb39e76c897634a255310661099900e5913a
Merge: d76ee30 14f31c3
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Jan 9 14:28:31 2015 +0100

    Merge branch 'Branch_5_1' into Branch_5_2

diff --cc src/plugins/mediawiki/www/LocalSettings.php
index c53d911,b0004ec..51f71e5
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@@ -63,7 -53,8 +63,8 @@@ $project_dir = forge_get_config('projec
  	. $fusionforgeproject ;
  
  if (!is_dir($project_dir)) {
- 	exit_error (sprintf(_('Mediawiki for project %s not created yet, please wait for a few minutes.'), $fusionforgeproject.':'.$project_dir)) ;
 -	fprintf(STDERR, _('Mediawiki for project %s not created yet, please wait for a few minutes.'), $fusionforgeproject);
++	fprintf(STDERR, _('Mediawiki for project %s (directory %s) not created yet, please wait for a few minutes.'), $fusionforgeproject, $project_dir);
+ 	exit(1);
  }
  
  
@@@ -76,10 -65,10 +77,11 @@@ require_once( "$IP/includes/DefaultSett
  
  if ( $wgCommandLineMode ) {
          if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
-                 die( "This script must be run from the command line\n" );
+                 fwrite(STDERR, "This script must be run from the command line\n");
+ 		exit(1);
          }
  }
 +
  $g = group_get_object_by_name($fusionforgeproject) ;
  $group_id = $g->getID();
  if (!$g->usesPlugin('mediawiki')) {

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

Summary of changes:
 src/plugins/mediawiki/bin/mw-fulldump       |    6 +++++-
 src/plugins/mediawiki/bin/mw-fullrestore    |    6 +++++-
 src/plugins/mediawiki/bin/mw-wrapper.php    |   10 ++++++----
 src/plugins/mediawiki/www/LocalSettings.php |    9 ++++++---
 4 files changed, 22 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list