Add an optional theme parameter to theme functions
This commit is contained in:
parent
3ce62aae1b
commit
7c9f3b61b4
@ -1,9 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/**
|
||||||
* Laconica - a distributed open-source microblogging tool
|
* Laconica, the distributed open-source microblogging tool
|
||||||
* Copyright (C) 2008, Controlez-Vous, Inc.
|
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* Utilities for theme files and paths
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
@ -15,19 +18,51 @@
|
|||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero 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/>.
|
||||||
|
*
|
||||||
|
* @category Paths
|
||||||
|
* @package Laconica
|
||||||
|
* @author Evan Prodromou <evan@controlyourself.ca>
|
||||||
|
* @author Sarven Capadisli <csarven@controlyourself.ca>
|
||||||
|
* @copyright 2008 Control Yourself, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
|
* @link http://laconi.ca/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('LACONICA')) { exit(1); }
|
if (!defined('LACONICA')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
function theme_file($relative)
|
/**
|
||||||
|
* Gets the full path of a file in a theme dir based on its relative name
|
||||||
|
*
|
||||||
|
* @param string $relative relative path within the theme directory
|
||||||
|
* @param string $theme name of the theme; defaults to current theme
|
||||||
|
*
|
||||||
|
* @return string File path to the theme file
|
||||||
|
*/
|
||||||
|
|
||||||
|
function theme_file($relative, $theme=null)
|
||||||
{
|
{
|
||||||
$theme = common_config('site', 'theme');
|
if (!$theme) {
|
||||||
|
$theme = common_config('site', 'theme');
|
||||||
|
}
|
||||||
return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
|
return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
function theme_path($relative)
|
/**
|
||||||
|
* Gets the full URL of a file in a theme dir based on its relative name
|
||||||
|
*
|
||||||
|
* @param string $relative relative path within the theme directory
|
||||||
|
* @param string $theme name of the theme; defaults to current theme
|
||||||
|
*
|
||||||
|
* @return string URL of the file
|
||||||
|
*/
|
||||||
|
|
||||||
|
function theme_path($relative, $theme=null)
|
||||||
{
|
{
|
||||||
$theme = common_config('site', 'theme');
|
if (!$theme) {
|
||||||
|
$theme = common_config('site', 'theme');
|
||||||
|
}
|
||||||
$server = common_config('theme', 'server');
|
$server = common_config('theme', 'server');
|
||||||
if ($server) {
|
if ($server) {
|
||||||
return 'http://'.$server.'/'.$theme.'/'.$relative;
|
return 'http://'.$server.'/'.$theme.'/'.$relative;
|
||||||
|
Loading…
Reference in New Issue
Block a user