cvs: docweb /include lib_general.inc.php
[email protected] ("Matthew Li")
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <cvsmazzanet1123751481@cvsserver> |
mazzanet Thu Aug 11 05:11:21 2005 EDT
Modified files:
/docweb/include lib_general.inc.php
Log:
Fix #34077
http://cvs.php.net/diff.php/docweb/include/lib_general.inc.php?r1=1.46&r2=1.47&ty=u
Index: docweb/include/lib_general.inc.php
diff -u docweb/include/lib_general.inc.php:1.46 docweb/include/lib_general.inc.php:1.47
--- docweb/include/lib_general.inc.php:1.46 Wed Aug 3 11:42:57 2005
+++ docweb/include/lib_general.inc.php Thu Aug 11 05:11:11 2005
@@ -18,7 +18,7 @@
| Gabor Hojtsy <[email protected]> |
| Sean Coates <[email protected]> |
+----------------------------------------------------------------------+
-$Id: lib_general.inc.php,v 1.46 2005/08/03 15:42:57 nlopess Exp $
+$Id: lib_general.inc.php,v 1.47 2005/08/11 09:11:11 mazzanet Exp $
*/
require_once dirname(__FILE__) . '/lib_auth.inc.php';
@@ -150,9 +150,11 @@
// Returns an insite address for a specified project, language and path (with fallback)
function get_insite_address($project = NULL, $lang = NULL, $path = NULL)
{
- if (!isset($project)) { $project = SITE; }
- if (!isset($lang)) { $lang = LANGC; }
- if (!isset($path)) { $path = URI; }
+ if (!isset($project)) { $project = SITE; }
+ if (!isset($lang)) { $lang = LANGC; }
+ if (!isset($path)) { $path = URI; }
+ if ($project != SITE) { $path = '/'; }
+ if ($path == '/index.php') { $path = '/'; }
$ret = '/';
if ($project != $GLOBALS['defaultProject']) {