Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/qa
authorRoland Haeder <roland@mxchange.org>
Mon, 11 May 2015 12:08:14 +0000 (14:08 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 11 May 2015 12:08:14 +0000 (14:08 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
core

.gitattributes [deleted file]
application/qa/config.php
application/qa/init.php

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644 (file)
index 207e2b0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-* text=auto !eol
-application/qa/.htaccess svneol=native#text/plain
-application/qa/class_ApplicationHelper.php svneol=native#text/plain
-application/qa/config.php svneol=native#text/plain
-application/qa/data.php svneol=native#text/plain
-application/qa/debug.php svneol=native#text/plain
-application/qa/exceptions.php svneol=native#text/plain
-application/qa/exceptions/.htaccess svneol=native#text/plain
-application/qa/init.php svneol=native#text/plain
-application/qa/interfaces/.htaccess svneol=native#text/plain
-application/qa/loader.php svneol=native#text/plain
-application/qa/main/.htaccess svneol=native#text/plain
-application/qa/starter.php svneol=native#text/plain
-application/qa/templates/.htaccess svneol=native#text/plain
-db/.htaccess -text
-db/news/.htaccess -text
-db/payments/.htaccess -text
-db/user/.htaccess -text
-db/user_points/.htaccess -text
-docs/COPYING -text
-docs/COPYING.documents -text
-docs/COPYING.software -text
-docs/NEWS -text
-docs/README -text
-docs/THANKS -text
-docs/TODO -text
-docs/TODOs.txt -text svneol=unset#text/plain
-/index.php svneol=native#text/plain
index 6da2a01f9a8566cbdcd6d27a94513fdb3b73a5c9..f6f263def7a600c418655edb01257d8e8ec28720 100644 (file)
@@ -32,7 +32,7 @@ $cfg->setConfigEntry('header_charset', 'utf-8');
 $cfg->setConfigEntry('default_web_command', 'start');
 
 // CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&amp;page=do_form');
+$cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&amp;command=do_form');
 
 // CFG: FORM-METHOD
 $cfg->setConfigEntry('form_method', 'post');
index 07979d7e74095842b008e62059aa223401812277..87ba50d884550b0c34857f02836ca4fbd36fb28b 100644 (file)
@@ -37,7 +37,7 @@
 $cfg = FrameworkConfiguration::getSelfInstance();
 
 // Initialize output system
-require($cfg->getConfigEntry('base_path') . 'inc/output.php');
+ApplicationHelper::createDebugInstance('ApplicationHelper');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script