aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-16 15:46:32 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-16 15:46:32 +0000
commit29493e33f56d584509ba6bbc73e259c20af0f118 (patch)
treeaf00182dbf76762f212388b28fd9ec90dfd3beed
parent99a301cd791d767c2b6ee9e2ff608ad9cbf1d281 (diff)
downloadelgg-29493e33f56d584509ba6bbc73e259c20af0f118.tar.gz
elgg-29493e33f56d584509ba6bbc73e259c20af0f118.tar.bz2
Removed some left over code from decoupling ECML.
Fixed help files for [[ -> [ transition. git-svn-id: http://code.elgg.org/elgg/trunk@5776 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/sitepages/languages/en.php2
-rw-r--r--mod/sitepages/start.php22
2 files changed, 1 insertions, 23 deletions
diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php
index 127e6c2ea..754719483 100644
--- a/mod/sitepages/languages/en.php
+++ b/mod/sitepages/languages/en.php
@@ -35,7 +35,7 @@ $english = array(
'sitepages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.",
'item:object:front' => 'Front page items',
- 'sitepages:error:no_login' => 'The logged out view for the front page must contain a [[login_box]] or your users can\'t login!',
+ 'sitepages:error:no_login' => 'The logged out view for the front page must contain a [login_box] or your users can\'t login!',
/**
* Status messages
diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index f8a0ba367..325ddc8da 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -153,28 +153,6 @@ function sitepages_page_handler($page) {
page_draw($title, $content);
}
-/**
- * Parses a registered view for supported keywords.
- *
- * @param unknown_type $hook
- * @param unknown_type $entity_type
- * @param unknown_type $return_value
- * @param unknown_type $params
- * @return string
- */
-function sitepages_parse_view($hook, $entity_type, $return_value, $params) {
- global $CONFIG;
-
- // give me everything that is (not a ]) possibly followed by a : and surrounded by [[ ]]s
- $keyword_regex = '/\[\[([a-z0-9_]+):?([^\]]+)?\]\]/';
-
- if (in_array($params['view'], $CONFIG->sitepages_parse_views)) {
- $return_value = preg_replace_callback($keyword_regex, 'sitepages_parse_view_match', $return_value);
- }
-
- return $return_value;
-}
-
/**
* Register some default keywords.