eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

consolidate some theme path code between ssl and non-ssl

Browse Source
This commit is contained in:
Evan Prodromou 2010-10-14 00:59:53 -04:00
parent ca0323d01b
commit 74c5aa8f9a
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/theme.php
View File

@ -134,15 +134,7 @@ class Theme
}
}
if ($path[strlen($path)-1] != '/') {
$path .= '/';
}
if ($path[0] != '/') {
$path = '/'.$path;
}
return 'https://'.$server.$path.$name;
$protocol = 'https';
} else {
@ -155,6 +147,15 @@ class Theme
}
}
$server = common_config($group, 'server');
if (empty($server)) {
$server = common_config('site', 'server');
}
$protocol = 'http';
}
if ($path[strlen($path)-1] != '/') {
$path .= '/';
}
@ -163,14 +164,7 @@ class Theme
$path = '/'.$path;
}
$server = common_config($group, 'server');
if (empty($server)) {
$server = common_config('site', 'server');
}
return 'http://'.$server.$path.$name;
}
return $protocol.'://'.$server.$path.$name;
}
/**