fix error while moving page

codepolitanlab · Jan 12, 2015 · 8827dd1 · 8827dd1
1 parent 657185d
commit 8827dd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/sites/default/config/site.json b/sites/default/config/site.json
@@ -1,6 +1,7 @@
 {
-    "site_name": "Jakarta",
-    "site_slogan": "Just a Simple Homepage by PusakaCMS",
-    "meta_description": "Nyankod Publish adalah blog media berisi konten seputar perkembangan Nyankod, mulai dari rilis produk, konten, kegiatan dan sebagainya.",
-    "meta_keywords": "nyankod publish, nyankodmagz, media, press release, launch produk, pemrograman, belajar pemrograman"
+	"site_name": "Jakarta",
+	"site_slogan": "Just a Simple Homepage by PusakaCMS",
+	"site_owner": "Toni Haryanto",
+	"meta_description": "Nyankod Publish adalah blog media berisi konten seputar perkembangan Nyankod, mulai dari rilis produk, konten, kegiatan dan sebagainya.",
+	"meta_keywords": "nyankod publish, nyankodmagz, media, press release, launch produk, pemrograman, belajar pemrograman"
 }
diff --git a/system/modules/panel/controllers/pages.php b/system/modules/panel/controllers/pages.php
@@ -232,9 +232,8 @@ function _move_page($prevslug, $slug, $source, $dest)
 					mkdir(PAGE_FOLDER.$dest, 0775);
 					rename(PAGE_FOLDER.$dest.'.md', PAGE_FOLDER.$dest.'/index.md');
 
-					// create index.html file and index.json
+					// create index.html file
 					copy(PAGE_FOLDER.'index.html', PAGE_FOLDER.$dest.'/index.html');
-					write_file(PAGE_FOLDER.$dest.'/index.json', '');
 				}
 			}
 		}
@@ -248,16 +247,15 @@ function _move_page($prevslug, $slug, $source, $dest)
 
 		// if file left the empty folder, not from the root
 		if(!empty($source) && $filesleft = glob(PAGE_FOLDER.$source.'/*')){
-			// if there are only index.html, index.md, and index.json
-			if(count($filesleft) <= 3){
+			// if there are only index.html, index.md
+			if(count($filesleft) <= 2){
 				// move to upper parent
 				$parent_subparent_arr = explode("/", $source);
 				$parent_name = array_pop($parent_subparent_arr);
 				$parent_subparent = implode("/", $parent_subparent_arr);
 				rename(PAGE_FOLDER.$source.'/index.md', PAGE_FOLDER.$parent_subparent.'/'.$parent_name.'.md');
 
 				unlink(PAGE_FOLDER.$source.'/index.html');
-				unlink(PAGE_FOLDER.$source.'/index.json');
 				rmdir(PAGE_FOLDER.$source);
 			}
 		}