From: Gabriel Dunne Date: Mon, 3 Oct 2011 17:10:46 +0000 (+0530) Subject: creating india branch X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=59f7e8e8585927530d2c70108349bfa2a6daba8b;p=plog.git creating india branch --- diff --git a/content/cat1/anothertest b/content/cat1/anothertest deleted file mode 100644 index de453e6..0000000 --- a/content/cat1/anothertest +++ /dev/null @@ -1,3 +0,0 @@ -title = another test --- -yeah some more content for another test post in category1 \ No newline at end of file diff --git a/content/cat1/sub/entry b/content/cat1/sub/entry deleted file mode 100644 index 53ee85e..0000000 --- a/content/cat1/sub/entry +++ /dev/null @@ -1,3 +0,0 @@ -title = a sub entry --- -a sub entry content \ No newline at end of file diff --git a/content/cat1/sub/subby/way_deep b/content/cat1/sub/subby/way_deep deleted file mode 100644 index 96f14e4..0000000 --- a/content/cat1/sub/subby/way_deep +++ /dev/null @@ -1,3 +0,0 @@ -title = waaaya deep --- -yeah yeah \ No newline at end of file diff --git a/content/cat2/another_test b/content/cat2/another_test deleted file mode 100644 index 80672cc..0000000 --- a/content/cat2/another_test +++ /dev/null @@ -1,3 +0,0 @@ -title = another test post --- -this is some content yo yo yo CATEGORY 2 in DA HIZ \ No newline at end of file diff --git a/content/cat2/test_post b/content/cat2/test_post deleted file mode 100644 index b568930..0000000 --- a/content/cat2/test_post +++ /dev/null @@ -1,10 +0,0 @@ -title = another test post -date = 2010-07-01 -tags = with different tags --- - -this is an older test post! - -`some code` - -CAT 222 in DA HIZ \ No newline at end of file diff --git a/index.php b/index.php index 7b23f24..35a6d2d 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,6 @@ $request = get_request(); $v = new View ($request); $m = new Model ($request); - if ($m->is_single()) $v->assign('entry', $m->entry); else if ($m->is_page()) @@ -16,5 +15,4 @@ else if ($m->is_multiple()) $v->assign('entries', $m->entries); header("Content-Type: {$m->response_mime_type}; charset=UTF-8"); - -$v->render( $m->template ); +$v->render( $m->template ); diff --git a/lib/model.php b/lib/model.php index 73a4ab9..56dffca 100644 --- a/lib/model.php +++ b/lib/model.php @@ -30,9 +30,9 @@ class Model $this->page_request = $this->request['filename']; - # if multiple entries (dir in CONTENT dir) + # if entries (dir in CONTENT dir) if ($this->is_multiple()) { - # check if config file exists + # check if config file exists in dir if ($this->has_config()) { $this->config = parse_config( $this->content_request ); if (isset($this->config['config']['template'])) { @@ -44,7 +44,7 @@ class Model } - # if single entry (file in CONTENT dir) + # if entry (file in CONTENT dir) else if ($this->is_single()) { $this->entry = get_entry( $this->content_request );