Jean-Frédéric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291197
Change subject: Move/Merge initialization bits from api.php to common.php
......................................................................
Move/Merge initialization bits from api.php to common.php
Common.php already has most of the necessary setup bits,
which is duplicated in api.php
Also do not import Intuition if not available.
Change-Id: I86ecdba64d3702a990f42b11f9c42bf419831539
---
M api/api.php
M api/common.php
2 files changed, 26 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/97/291197/1
diff --git a/api/api.php b/api/api.php
index 6955a7f..455750c 100644
--- a/api/api.php
+++ b/api/api.php
@@ -1,36 +1,6 @@
<?php
/* Entry point for the monuments api */
-require dirname( __FILE__ ) . '/autoloader.php';
-require dirname( __FILE__ ) . '/includes/Defaults.php';
-/**
- * Look for config overrides
- *
- * First look in p_erfgoed's parent dir, then in p_erfgoed root.
- * Otherwise, erfgoed will just use Defaults.php.
- */
-$config_override = 'database.inc';
-if ( file_exists( dirname( dirname( dirname( __FILE__ ) ) ) .
"/{$config_override}" ) ) {
- require dirname( dirname( dirname( __FILE__ ) ) ) .
"/{$config_override}";
-} elseif ( file_exists( dirname( dirname( __FILE__ ) ) . "/{$config_override}"
) ) {
- require dirname( dirname( __FILE__ ) ) . "/{$config_override}";
-}
-
-/* Localization */
-if ( $tsI18nDir ) {
- require_once( "$tsI18nDir/ToolStart.php" );
- $opts = array(
- 'domain' => 'MonumentsAPI', // name of your main text-domain
here
- 'globalfunctions' => true, // defines _(), _e() and _g() as
shortcut for $I18N->msg( .. )
- 'suppressnotice' => true,
- );
- $I18N = new TsIntuition( $opts );
-}
-
-$dbStatus = Database::define($dbServer, $dbDatabase, $dbUser,
- $dbPassword );
-if (!$dbStatus) {
- die( "Coudn't connect to db! ". mysql_error() );
-}
+require dirname( __FILE__ ) . '/common.php';
ApiMain::dispatch();
diff --git a/api/common.php b/api/common.php
index c5348f9..e669644 100644
--- a/api/common.php
+++ b/api/common.php
@@ -1,28 +1,43 @@
<?php
error_reporting(E_ALL);
ini_set('display_errors', true);
-ini_set('html_errors', false);
+ini_set('html_errors', true);
/* Entry point for the monuments api */
require dirname( __FILE__ ) . '/autoloader.php';
require dirname( __FILE__ ) . '/includes/Defaults.php';
-require dirname( dirname( dirname( __FILE__ ) ) ) . '/database.inc';
+
+/**
+ * Look for config overrides
+ *
+ * First look in p_erfgoed's parent dir, then in p_erfgoed root.
+ * Otherwise, erfgoed will just use Defaults.php.
+ */
+$config_override = 'database.inc';
+if ( file_exists( dirname( dirname( dirname( __FILE__ ) ) ) .
"/{$config_override}" ) ) {
+ require dirname( dirname( dirname( __FILE__ ) ) ) .
"/{$config_override}";
+} elseif ( file_exists( dirname( dirname( __FILE__ ) ) . "/{$config_override}"
) ) {
+ require dirname( dirname( __FILE__ ) ) . "/{$config_override}";
+}
/* Localization */
-require_once( "$tsI18nDir/ToolStart.php" );
+if ( $tsI18nDir ) {
+ require_once( "$tsI18nDir/ToolStart.php" );
+ $opts = array(
+ 'domain' => 'MonumentsAPI', // name of your main text-domain
here
+ 'globalfunctions' => true, // defines _(), _e() and _g() as
shortcut for $I18N->msg( .. )
+ 'suppresserrors' => false, // Krinkle heeft het stukgemaakt
+ );
+ $I18N = new TsIntuition( $opts );
+} else {
+ $I18N = null;
+}
$dbStatus = Database::define($dbServer, $dbDatabase, $dbUser,
isset( $toolserver_password )? $toolserver_password : $dbPassword );
if (!$dbStatus) {
die( "Coudn't connect to db! ". mysql_error() );
}
-
-$opts = array(
- 'domain' => 'MonumentsAPI', // name of your main text-domain here
- 'globalfunctions' => true, // defines _(), _e() and _g() as shortcut
for $I18N->msg( .. )
- 'suppresserrors' => false, // Krinkle heeft het stukgemaakt
- );
-$I18N = new TsIntuition( $opts );
header ('Content-type: text/html; charset=utf-8');
--
To view, visit https://gerrit.wikimedia.org/r/291197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86ecdba64d3702a990f42b11f9c42bf419831539
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
