[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 3de9d67430a7fe002f648e5687a00a194c83f9a3

Thorsten Glaser mirabilos at fusionforge.org
Fri Jan 9 14:54:47 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_3 has been updated
       via  3de9d67430a7fe002f648e5687a00a194c83f9a3 (commit)
       via  2e7ee970e1a7d552c6c84adc8a0e23fe036eef8d (commit)
       via  ce8690b470ead3945f28330f632ebe5e78627a4f (commit)
       via  d64ddaa721148cb31521fc588a3ba3221431e7ec (commit)
       via  5a6239d8c44a7fe00e785301459e498c5bd372eb (commit)
       via  ec76ed922442b81a78b04b15c1d9bb086a727a91 (commit)
       via  dfe9cb6828211f0d7fc67df1d07aebe5f4e02658 (commit)
      from  6cc96c7c13647d6d20024cd4ea92c005d9f6f411 (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 3de9d67430a7fe002f648e5687a00a194c83f9a3
Merge: d64ddaa 2e7ee97
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Jan 9 14:54:35 2015 +0100

    Merge branch 'Branch_5_2' into Branch_5_3

diff --cc src/common/include/squal_exit.php
index b8a5aac,ada3a64..d6ab007
--- a/src/common/include/squal_exit.php
+++ b/src/common/include/squal_exit.php
@@@ -37,7 -37,7 +37,7 @@@ $exit_errorlevel = 0
   * @param		string	Error toptab
   */
  function exit_error($title,$toptab='') {
- 	print 'Error: '.$title;
 -	print 'ERROR - ' . $title . "\n";
++	print 'Error: ' . $title . "\n";
  	exit($exit_errorlevel);
  }
  

commit d64ddaa721148cb31521fc588a3ba3221431e7ec
Merge: 6cc96c7 5a6239d
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Jan 9 14:53:12 2015 +0100

    Merge branch 'Branch_5_2' into Branch_5_3

diff --cc src/common/include/exit.php
index c5ff353,fa7befd..107550f
--- a/src/common/include/exit.php
+++ b/src/common/include/exit.php
@@@ -23,10 -22,18 +23,18 @@@
   */
  
  /**
+  * exit_errorlevel – Return code for exit_error() and friends
+  *
+  * A script can set this to explicitly return a different
+  * status code than the historic default of 0 to the caller.
+  */
+ $exit_errorlevel = 0;
+ 
+ /**
   * exit_error() - Exit PHP with error
   *
 - * @param	string	Error text
 - * @param	string	toptab for navigation bar
 + * @param	string	$text	Error text
 + * @param	string	$toptab for navigation bar
   */
  function exit_error($text = "", $toptab = '') {
  	global $HTML, $group_id;
diff --cc src/common/include/squal_exit.php
index 5caa7a6,05a7b6a..b8a5aac
--- a/src/common/include/squal_exit.php
+++ b/src/common/include/squal_exit.php
@@@ -29,8 -37,8 +37,8 @@@ $exit_errorlevel = 0
   * @param		string	Error toptab
   */
  function exit_error($title,$toptab='') {
 -	print 'ERROR - '.$title;
 +	print 'Error: '.$title;
- 	exit;
+ 	exit($exit_errorlevel);
  }
  
  /**
diff --cc src/plugins/mediawiki/www/LocalSettings.php
index 699213b,5a576d2..2ca9ecf
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@@ -63,10 -63,11 +63,10 @@@ $project_dir = forge_get_config('projec
  	. $fusionforgeproject ;
  
  if (!is_dir($project_dir)) {
- 	fprintf(STDERR, _('Mediawiki for project %s (directory %s) not created yet, please wait for a few minutes.') . "\n", $fusionforgeproject, $project_dir);
- 	exit(1);
+ 	$exit_errorlevel = 1;
+ 	exit_error(sprintf(_('Mediawiki for project %s (directory %s) not created yet, please wait for a few minutes.'), $fusionforgeproject, $project_dir));
  }
  
 -
  $path = array( $IP, "$IP/includes", "$IP/languages" );
  set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
  

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

Summary of changes:
 src/common/include/exit.php                 |   10 +++++++++-
 src/common/include/squal_exit.php           |   12 ++++++++++--
 src/plugins/mediawiki/www/LocalSettings.php |   12 ++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list