Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 01:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
This commit is contained in:
Michael Vogel 2013-02-17 12:35:40 +01:00
commit 93143702ed
831 changed files with 37929 additions and 30644 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/admin.php
View file

@ -980,10 +980,14 @@ function admin_page_themes(&$a){
toggle_theme($themes,$theme,$result);
$s = rebuild_theme_table($themes);
if($result)
if($result) {
install_theme($theme);
info( sprintf('Theme %s enabled.',$theme));
else
}
else {
uninstall_theme($theme);
info( sprintf('Theme %s disabled.',$theme));
}
set_config('system','allowed_themes',$s);
goaway($a->get_baseurl(true) . '/admin/themes' );