SERVER_URL should be set before getActualVersion() is called

diff --git a/inc/databases.php b/inc/databases.php
index b687096cfeaf0d5935bddc5d8926741ea0dffad8..7e3f7d06ae7b3b37353824166f503462fd0abca2 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -78,6 +78,9 @@ define('CODE_LOGIN_FAILED'     , 0x020);
 define('CODE_BEG_SAME_AS_OWN'  , 0x021);
 define('CODE_UNHANDLED_STATUS' , 0x022);
 
 define('CODE_BEG_SAME_AS_OWN'  , 0x021);
 define('CODE_UNHANDLED_STATUS' , 0x022);
 

+// Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!)
+define('SERVER_URL', "http://www.mxchange.org");
+

 // Full version string: /([0-9]){1}\.([0-9]){1}\.([0-9]){1}(-(alpha|beta|pre|rc([1-3]))([0-9]+))?/
 // If you understand regular expressions ^^^ you may know how I versionize... ;-)
 define('FULL_VERSION', getActualVersion('Tag'));
 // Full version string: /([0-9]){1}\.([0-9]){1}\.([0-9]){1}(-(alpha|beta|pre|rc([1-3]))([0-9]+))?/
 // If you understand regular expressions ^^^ you may know how I versionize... ;-)
 define('FULL_VERSION', getActualVersion('Tag'));


@@ -98,9 +101,6 @@ setConfigEntry('one_day', (60*60*24));
 define('START_YDAY', MAKE_TIME(0, 0, 0, time() - getConfig('one_day')));
 define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 
 define('START_YDAY', MAKE_TIME(0, 0, 0, time() - getConfig('one_day')));
 define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 

-// Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!)
-define('SERVER_URL', "http://www.mxchange.org");
-

 // Current SVN revision
 define('CURR_SVN_REVISION', getActualVersion('Revision'));define('CURR_SVN_DATE'    , getActualVersion('Date'));
 // Take a prime number which is long (if you know a longer one please try it out!)
 // Current SVN revision
 define('CURR_SVN_REVISION', getActualVersion('Revision'));define('CURR_SVN_DATE'    , getActualVersion('Date'));
 // Take a prime number which is long (if you know a longer one please try it out!)

diff --git a/templates/de/html/copyright.tpl b/templates/de/html/copyright.tpl
index 71ca20ca8d8843b79631dcc89abbbc4e3ce46a14..4ebd42f27897f207de4f4933000860e391d681c1 100644 (file)
--- a/templates/de/html/copyright.tpl
+++ b/templates/de/html/copyright.tpl
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" align="center">
        <tr>
                <td align="center" class="footer_lines">
 <table border="0" cellspacing="0" cellpadding="0" align="center">
        <tr>
                <td align="center" class="footer_lines">

-                       {!TITLE!} v{!FULL_VERSION!}<!-- R{!CURR_SVN_REVISION!}//--><br />
+                       {!TITLE!} v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}<br />

                        Copyright &copy; 2003 - 2008 by Roland H&auml;der
                </td>
                <td align="center" width="50%" class="footer_lines">This
                        Copyright &copy; 2003 - 2008 by Roland H&auml;der
                </td>
                <td align="center" width="50%" class="footer_lines">This

diff --git a/templates/de/html/copyright_backlink.tpl b/templates/de/html/copyright_backlink.tpl
index 9b9e1a6fc143b60b9ace489a9866939141090b51..68f9d8982c4ce630a7a6eca5fc46c02664baf6ba 100644 (file)
--- a/templates/de/html/copyright_backlink.tpl
+++ b/templates/de/html/copyright_backlink.tpl
@@ -2,7 +2,7 @@
        <tr>
                <td align="center" class="footer_lines">
                        [<a href="{!SERVER_URL!}/" title="{!TITLE!}" target="_blank" rel="external">{!TITLE!}</a>]
        <tr>
                <td align="center" class="footer_lines">
                        [<a href="{!SERVER_URL!}/" title="{!TITLE!}" target="_blank" rel="external">{!TITLE!}</a>]

-                       v{!FULL_VERSION!}<!-- R{!CURR_SVN_REVISION!}//--><br />
+                       v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}<br />

                        {!COPY!}
                </td>
                <td align="center" width="50%" class="footer_lines">
                        {!COPY!}
                </td>
                <td align="center" width="50%" class="footer_lines">