Related to former commit (restore simple_dates)

olafgleba · Jun 24, 2012 · f67e722 · f67e722
1 parent d256127
commit f67e722
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/welcompose/core/conf/sys.inc.php b/welcompose/core/conf/sys.inc.php
@@ -100,6 +100,14 @@
 generator_form_index_start = "/index.php?project_name=<project_name>&amp;action=Index"
 global_template_url = "/global_template.php?project_name=<project_name>&amp;name=<global_template_name>"
 global_template_url_start = "/global_template.php?project_name=<project_name>&amp;name=<global_template_name>&amp;&amp;start=<start>"
+simple_date_index = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"
+simple_date_index_pager = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index&amp;start=<start>"
+simple_date_index_start = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"
+simple_date_index_start_pager = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index&amp;start=<start>"
+simple_date_atom_10 = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Atom10"
+simple_date_atom_10_start = "/index.php?project_name=<project_name>&amp;action=Atom10"
+simple_date_rss_20 = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Rss20"
+simple_date_rss_20_start = "/index.php?project_name=<project_name>&amp;action=Rss20"
 simple_form_index = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"
 simple_form_index_start = "/index.php?project_name=<project_name>&amp;action=Index"
 simple_guestbook_index = "/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"

diff --git a/welcompose/core/conf/sys.inc.php-dist b/welcompose/core/conf/sys.inc.php-dist
@@ -99,6 +99,14 @@ generator_form_index =
 generator_form_index_start = 
 global_template_url = 
 global_template_url_start = 
+simple_date_index = 
+simple_date_index_pager = 
+simple_date_index_start = 
+simple_date_index_start_pager = 
+simple_date_atom_10 = 
+simple_date_atom_10_start = 
+simple_date_rss_20 = 
+simple_date_rss_20_start = 
 simple_form_index = 
 simple_form_index_start = 
 simple_guestbook_index = 

diff --git a/welcompose/setup/smarty/templates/sys.inc.txt b/welcompose/setup/smarty/templates/sys.inc.txt
@@ -98,7 +98,7 @@ event_rss_20_start_tag = "{$configuration.root_www}/index.php?project_name=<proj
 generator_form_index = "{$configuration.root_www}/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"
 generator_form_index_start = "{$configuration.root_www}/index.php?project_name=<project_name>&amp;action=Index"
 global_template_url = "{$configuration.root_www}/global_template.php?name=<global_template_name>&amp;project_name=<project_name>"
-global_template_url_start = "{$configuration.root_www}/global_template.php?name=<global_file_name>&amp;project_name=<project_name>&amp;start=<start>"
+global_template_url_start = "{$configuration.root_www}/global_template.php?name=<global_template_name>&amp;project_name=<project_name>&amp;start=<start>"
 simple_date_index = "{$configuration.root_www}/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"
 simple_date_index_pager = "{$configuration.root_www}/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index&amp;start=<start>"
 simple_date_index_start = "{$configuration.root_www}/index.php?project_name=<project_name>&amp;page_name=<page_name>&amp;action=Index"

diff --git a/welcompose/update/tasks/0001-013.php b/welcompose/update/tasks/0001-013.php
@@ -361,7 +361,7 @@
 				}
 			}
 
-			// add new template type simple_date_index to every project
+			// add new template type event_index to every project
 			foreach ($projects as $_project) {
 				// get existing template types
 				$sql = "
@@ -411,7 +411,7 @@
 			}
 
 
-			// add new template type simple_date_rss20 to every project
+			// add new template type event_rss20 to every project
 			foreach ($projects as $_project) {
 				// get existing template types
 				$sql = "
@@ -460,7 +460,7 @@
 				}
 			}
 
-			// add new template type simple_date_atom10 to every project
+			// add new template type event_atom10 to every project
 			foreach ($projects as $_project) {
 				// get existing template types
 				$sql = "