refs #1700 : bugfix - setup include.php does not compatible with code

cache function. - Conflicts: library/include.php
Needlworks · Nov 5, 2014 · 13ac4e8 · 13ac4e8
1 parent 75c5342
commit 13ac4e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/library/include.php b/library/include.php
@@ -6,6 +6,9 @@
 /** Pre-define basic components */
 global $__requireBasics, $__requireComponent, $__requireLibrary, $__requireModel, $__requireView;
 /***** Loading code pieces *****/
+if(isset($uri)) {
+	$codeName = $uri->uri['interfaceType'];
+}
 if(isset($service['codecache']) && ($service['codecache'] == true) && file_exists(__TEXTCUBE_CACHE_DIR__.'/code/'.$codeName)) {
 	$codeCacheRead = true;
 	require(__TEXTCUBE_CACHE_DIR__.'/code/'.$codeName);

diff --git a/setup.php b/setup.php
@@ -1308,11 +1308,7 @@ function fail($msg) {
 \$service['type'] = '{$_POST['type']}';
 \$service['domain'] = '{$_POST['domain']}';
 \$service['path'] = '$path';
-<<<<<<< HEAD
-\$service['skin'] = 'musicpaper';
-=======
 \$service['skin'] = 'periwinkle';
->>>>>>> c92e95f...  refs #1544 : modified - periwinkle to default skin
 \$service['favicon_daily_traffic'] = 10; // 10MB
 //\$serviceURL = 'http://{$_POST['domain']}{$path}' ; // for path of Skin, plugin and etc.
 //\$service['reader'] = true; // Use Textcube reader. You can set it to false if you do not use Textcube reader, and want to decrease DB load.