lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Laurent Destailleur 2013-05-31 08:02:53 +02:00
commit 67a6313487
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/support/default.css
View File

@ -13,7 +13,6 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/ */
body { body {

13
htdocs/support/inc.php
View File

@ -24,24 +24,13 @@
* \brief File that define environment for support pages * \brief File that define environment for support pages
*/ */
// Just to define version DOL_VERSION // Define DOL_DOCUMENT_ROOT
if (! defined('DOL_INC_FOR_VERSION_ERROR')) define('DOL_INC_FOR_VERSION_ERROR','1');
require_once '../filefunc.inc.php';
// Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process
if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..');
if (! defined('ADODB_PATH'))
{
$foundpath=DOL_DOCUMENT_ROOT .'/includes/adodbtime/';
if (! is_dir($foundpath)) $foundpath='/usr/share/php/adodb/';
define('ADODB_PATH', $foundpath);
}
require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once ADODB_PATH.'adodb-time.inc.php';
// Avoid warnings with strict mode E_STRICT // Avoid warnings with strict mode E_STRICT
$conf = new stdClass(); // instantiate $conf explicitely $conf = new stdClass(); // instantiate $conf explicitely

2
htdocs/support/index.php
View File

@ -41,7 +41,7 @@ $langs->load("help");
* View * View
*/ */
pHeader($langs->trans("DolibarrHelpCenter").' '.DOL_VERSION, $_SERVER["PHP_SELF"]); pHeader($langs->trans("DolibarrHelpCenter"), $_SERVER["PHP_SELF"]);
print $langs->trans("HelpCenterDesc1")."<br>\n"; print $langs->trans("HelpCenterDesc1")."<br>\n";
print $langs->trans("HelpCenterDesc2")."<br>\n"; print $langs->trans("HelpCenterDesc2")."<br>\n";