Changeset 3197 for trunk/admin

Timestamp:

Mar 14, 2009, 12:43:50 AM (15 years ago)

Author:

plg

Message:

merge r3196 from branch 2.0 to trunk

bug 926 fixed: change links to piwigo.org so that they go to existing URLs.

new: if the current language is french, the links go to fr.piwigo.org instead.

Location:

trunk/admin

Files:

• include/functions.php (modified) (1 diff)
• intro.php (modified) (1 diff)
• template/goto/footer.tpl (modified) (1 diff)
• template/goto/intro.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -1742 +1742 @@
 function pwg_URL()
 {
-  global $lang_info;
   $urls = array(
-    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc/',
-    'HOME'       => 'http://'.PHPWG_DOMAIN.'/',
-    'DEMO'       => 'http://demo.'.PHPWG_DOMAIN.'/',
-    'FORUM'      => 'http://forum.'.PHPWG_DOMAIN.'/',
-    'BUGS'       => 'http://bugs.'.PHPWG_DOMAIN.'/',
+    'HOME'       => 'http://'.PHPWG_DOMAIN,
+    'WIKI'       => 'http://'.PHPWG_DOMAIN.'/doc',
+    'DEMO'       => 'http://'.PHPWG_DOMAIN.'/demo',
+    'FORUM'      => 'http://'.PHPWG_DOMAIN.'/forum',
+    'BUGS'       => 'http://'.PHPWG_DOMAIN.'/bugs',
     'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
     );
-  if ( isset($lang_info['code']) and
-       in_array($lang_info['code'], array('fr','en')) )
-  { /* current wiki languages are French or English */
-    $urls['WIKI'] .= 'doku.php?id='.$lang_info['code'].':'.$lang_info['code'];
-    $urls['HOME'] .= '?lang='.$lang_info['code'];
-  }
   return $urls;
 }

trunk/admin/intro.php

@@ -183 +183 @@
 $template->assign(
   array(
+    'PHPWG_URL' => PHPWG_URL,
     'PWG_VERSION' => PHPWG_VERSION,
     'OS' => PHP_OS,

trunk/admin/template/goto/footer.tpl

@@ -16 +16 @@
 
   {'powered_by'|@translate}
-  <a href="http://piwigo.org" class="Piwigo">
+  <a href="{$PHPWG_URL}" class="Piwigo">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}

trunk/admin/template/goto/intro.tpl

@@ -5 +5 @@
   <dd>
     <ul>
-      <li><a href="http://piwigo.org"  onclick="window.open(this.href, ''); 
+      <li><a href="{$PHPWG_URL}"  onclick="window.open(this.href, ''); 
           return false;">Piwigo</a> {$PWG_VERSION}</li>
       <li><a href="{$U_CHECK_UPGRADE}">{'Check for upgrade'|@translate}</a></li>