Replaced all occurrences of register_page_handler in core with elgg_register_page_handler

git-svn-id: http://code.elgg.org/elgg/trunk@8244 36083f99-b078-4883-b0ff-0f9b5a30f544

11 files changed, 32 insertions, 28 deletions

diff --git a/engine/handlers/page_handler.php b/engine/handlers/page_handler.php
index 69dbea79a..c71e820b2 100644
--- a/engine/handlers/page_handler.php
+++ b/engine/handlers/page_handler.php
@@ -4,11 +4,11 @@
  *
  * This file dispatches pages.  It is called via a URL rewrite in .htaccess
  * from http://site/pg/handler/page1/page2.  The first element after 'pg/' is
- * the page handler name as registered by {@link register_page_handler()}.
+ * the page handler name as registered by {@link elgg_register_page_handler()}.
  * The rest of the string is sent to {@link page_handler()}.
  *
  * {@link page_handler()} explodes the pages string by / and sends it to
- * the page handler function as registered by {@link register_page_handler()}.
+ * the page handler function as registered by {@link elgg_register_page_handler()}.
  * If a valid page handler isn't found, plugins have a chance to provide a 404.
  *
  * @package Elgg.Core
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 2384a9278..6d0b60101 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -221,8 +221,8 @@ function admin_init() {
 		);
 	}
 
-	register_page_handler('admin', 'admin_settings_page_handler');
-	register_page_handler('admin_plugin_screenshot', 'admin_plugin_screenshot_page_handler');
+	elgg_register_page_handler('admin', 'admin_settings_page_handler');
+	elgg_register_page_handler('admin_plugin_screenshot', 'admin_plugin_screenshot_page_handler');
 }
 
 /**
diff --git a/engine/lib/cron.php b/engine/lib/cron.php
index f216e0b2d..ef0cf17b2 100644
--- a/engine/lib/cron.php
+++ b/engine/lib/cron.php
@@ -13,7 +13,7 @@
  */
 function cron_init() {
 	// Register a pagehandler for cron
-	register_page_handler('cron', 'cron_page_handler');
+	elgg_register_page_handler('cron', 'cron_page_handler');
 
 	// register a hook for Walled Garden public pages
 	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'cron_public_pages');
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 95330844d..fbd33b219 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1834,8 +1834,8 @@ function elgg_init() {
 	elgg_register_action('likes/add');
 	elgg_register_action('likes/delete');
 
-	register_page_handler('js', 'js_page_handler');
-	register_page_handler('css', 'css_page_handler');
+	elgg_register_page_handler('js', 'js_page_handler');
+	elgg_register_page_handler('css', 'css_page_handler');
 
 	// Trigger the shutdown:system event upon PHP shutdown.
 	register_shutdown_function('_elgg_shutdown_hook');
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index db0e0fddd..81c14da4d 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2202,7 +2202,7 @@ function entities_test($hook, $type, $value, $params) {
  * @elgg_event_handler init system
  */
 function entities_init() {
-	register_page_handler('view', 'entities_page_handler');
+	elgg_register_page_handler('view', 'entities_page_handler');
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'entities_test');
 
diff --git a/engine/lib/input.php b/engine/lib/input.php
index db43f9a24..0d34db8ae 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -353,7 +353,7 @@ function input_livesearch_page_handler($page) {
  */
 function input_init() {
 	// register an endpoint for live search / autocomplete.
-	register_page_handler('livesearch', 'input_livesearch_page_handler');
+	elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
 
 	if (ini_get_bool('magic_quotes_gpc')) {
 
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index 937b962db..1fa073c1e 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -88,7 +88,7 @@ function elgg_register_page_handler($handler, $function) {
 /**
  * Unregister a page handler for an identifier
  *
- * Note: to replace a page handler, call register_page_handler()
+ * Note: to replace a page handler, call elgg_register_page_handler()
  *
  * @param string $handler The page type identifier
  *
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 2c8925393..43a1c38d5 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -531,7 +531,7 @@ function elgg_river_page_handler($page) {
  * Initialize river library
  */
 function elgg_river_init() {
-	register_page_handler('activity', 'elgg_river_page_handler');
+	elgg_register_page_handler('activity', 'elgg_river_page_handler');
 	$item = new ElggMenuItem('activity', elgg_echo('activity'), 'pg/activity');
 	elgg_register_menu_item('site', $item);
 }
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index c952a8bab..32d48eff2 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -314,11 +314,6 @@ function elgg_get_registered_tag_metadata_names() {
 	return $names;
 }
 
-// register the standard tags metadata name
-elgg_register_tag_metadata_name('tags');
-
-register_page_handler('tags', 'elgg_tagcloud_page_handler');
-
 /**
  * Page hander for tags
  *
@@ -343,3 +338,12 @@ function elgg_tagcloud_page_handler($page) {
 			break;
 	}
 }
+
+function elgg_tags_init() {
+	// register the standard tags metadata name
+	elgg_register_tag_metadata_name('tags');
+	
+	elgg_register_page_handler('tags', 'elgg_tagcloud_page_handler');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_tags_init');
\ No newline at end of file
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index e3688d7f7..0247dc5d9 100644
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -315,7 +315,7 @@ function usersettings_page_handler($page) {
  * @return void
  */
 function usersettings_init() {
-	register_page_handler('settings', 'usersettings_page_handler');
+	elgg_register_page_handler('settings', 'usersettings_page_handler');
 
 	elgg_register_plugin_hook_handler('usersettings:save', 'user', 'users_settings_save');
 
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 8d8c7fb64..ce325f21e 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1486,17 +1486,17 @@ function users_pagesetup() {
 function users_init() {
 	global $CONFIG;
 
-	register_page_handler('friends', 'friends_page_handler');
-	register_page_handler('friendsof', 'friends_of_page_handler');
-	register_page_handler('dashboard', 'dashboard_page_handler');
-	register_page_handler('register', 'registration_page_handler');
-	register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
-	register_page_handler('login', 'elgg_user_login_page_handler');
-	register_page_handler('members', 'elgg_members_page_handler');
-	register_page_handler('avatar', 'elgg_avatar_page_handler');
-	register_page_handler('profile', 'elgg_profile_page_handler');
-
-	//register_page_handler('collections', 'collections_page_handler');
+	elgg_register_page_handler('friends', 'friends_page_handler');
+	elgg_register_page_handler('friendsof', 'friends_of_page_handler');
+	elgg_register_page_handler('dashboard', 'dashboard_page_handler');
+	elgg_register_page_handler('register', 'registration_page_handler');
+	elgg_register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
+	elgg_register_page_handler('login', 'elgg_user_login_page_handler');
+	elgg_register_page_handler('members', 'elgg_members_page_handler');
+	elgg_register_page_handler('avatar', 'elgg_avatar_page_handler');
+	elgg_register_page_handler('profile', 'elgg_profile_page_handler');
+
+	//elgg_register_page_handler('collections', 'collections_page_handler');
 
 	$item = new ElggMenuItem('members', elgg_echo('members'), 'pg/members');
 	elgg_register_menu_item('site', $item);