mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
This commit is contained in:
vanhofen
2016-10-01 11:54:51 +02:00
parent ad7836f819 65c4cfec97
commit b76e14080e
48 changed files with 572 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/network_setup.cpp
View File

@@ -731,7 +731,7 @@ void CNetworkSetup::testNetworkSettings()
//get www-domain testsite from /.version
CConfigFile config('\t');
config.loadConfig("/.version");
config.loadConfig(TARGET_PREFIX "/.version");
testsite = config.getString("homepage",defaultsite);
testsite.replace( 0, testsite.find("www",0), "" );