Fixes #2921: converted internalname => name and internalid => id

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

4 files changed, 26 insertions, 26 deletions

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index ede87386c..6ab51ccbd 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -281,8 +281,8 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 	);
 
 	$vars = array();
-	$vars['internalid'] = 'blog-post-edit';
-	$vars['internalname'] = 'blog_post';
+	$vars['id'] = 'blog-post-edit';
+	$vars['name'] = 'blog_post';
 
 	if ($page == 'edit') {
 		$blog = get_entity((int)$guid);
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 47f306ba1..6020ad4b0 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -28,22 +28,22 @@ $action_buttons = $save_button . $delete_link;
 
 $title_label = elgg_echo('title');
 $title_input = elgg_view('input/text', array(
-	'internalname' => 'title',
-	'internalid' => 'blog_title',
+	'name' => 'title',
+	'id' => 'blog_title',
 	'value' => $vars['title']
 ));
 
 $excerpt_label = elgg_echo('blog:excerpt');
 $excerpt_input = elgg_view('input/text', array(
-	'internalname' => 'excerpt',
-	'internalid' => 'blog_excerpt',
+	'name' => 'excerpt',
+	'id' => 'blog_excerpt',
 	'value' => html_entity_decode($vars['excerpt'], ENT_COMPAT, 'UTF-8')
 ));
 
 $body_label = elgg_echo('blog:body');
 $body_input = elgg_view('input/longtext', array(
-	'internalname' => 'description',
-	'internalid' => 'blog_description',
+	'name' => 'description',
+	'id' => 'blog_description',
 	'value' => $vars['description']
 ));
 
@@ -56,8 +56,8 @@ if ($vars['publish_date']) {
 
 $status_label = elgg_echo('blog:status');
 $status_input = elgg_view('input/dropdown', array(
-	'internalname' => 'status',
-	'internalid' => 'blog_status',
+	'name' => 'status',
+	'id' => 'blog_status',
 	'value' => $vars['status'],
 	'options_values' => array(
 		'draft' => elgg_echo('blog:status:draft'),
@@ -67,39 +67,39 @@ $status_input = elgg_view('input/dropdown', array(
 
 $comments_label = elgg_echo('comments');
 $comments_input = elgg_view('input/dropdown', array(
-	'internalname' => 'comments_on',
-	'internalid' => 'blog_comments_on',
+	'name' => 'comments_on',
+	'id' => 'blog_comments_on',
 	'value' => $vars['comments_on'],
 	'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off'))
 ));
 
 $tags_label = elgg_echo('tags');
 $tags_input = elgg_view('input/tags', array(
-	'internalname' => 'tags',
-	'internalid' => 'blog_tags',
+	'name' => 'tags',
+	'id' => 'blog_tags',
 	'value' => $vars['tags']
 ));
 
 $access_label = elgg_echo('access');
 $access_input = elgg_view('input/access', array(
-	'internalname' => 'access_id',
-	'internalid' => 'blog_access_id',
+	'name' => 'access_id',
+	'id' => 'blog_access_id',
 	'value' => $vars['access_id']
 ));
 
 // not being used
 $publish_date_label = elgg_echo('blog:publish_date');
 $publish_date_input = elgg_view('input/datetime', array(
-	'internalname' => 'publish_date',
-	'internalid' => 'blog_publish_date',
+	'name' => 'publish_date',
+	'id' => 'blog_publish_date',
 	'value' => $vars['publish_date']
 ));
 
 $categories_input = elgg_view('categories', $vars);
 
 // hidden inputs
-$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => elgg_get_page_owner_guid()));
-$guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['guid']));
+$container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid()));
+$guid_input = elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['guid']));
 
 
 echo <<<___HTML
diff --git a/mod/blog/views/default/input/datetime.php b/mod/blog/views/default/input/datetime.php
index 7933c7bd7..3a7244b88 100644
--- a/mod/blog/views/default/input/datetime.php
+++ b/mod/blog/views/default/input/datetime.php
@@ -15,32 +15,32 @@ for ($i=1; $i <= 12; $i++) {
 }
 
 $month = elgg_view('input/dropdown', array(
-	'internalname' => 'publish_month',
+	'name' => 'publish_month',
 	'value' => date('m', $publish_date),
 	'options_values' => $months,
 	'class' => 'blog_publish_month',
 ));
 
 $day = elgg_view('input/text', array(
-	'internalname' => 'publish_day',
+	'name' => 'publish_day',
 	'value' => date('d', $publish_date),
 	'class' => 'blog_publish_day',
 ));
 
 $year = elgg_view('input/text', array(
-	'internalname' => 'publish_year',
+	'name' => 'publish_year',
 	'value' => date('Y', $publish_date),
 	'class' => 'blog_publish_year',
 ));
 
 $hour = elgg_view('input/text', array(
-	'internalname' => 'publish_hour',
+	'name' => 'publish_hour',
 	'value' => date('H', $publish_date),
 	'class' => 'blog_publish_hour',
 ));
 
 $minute = elgg_view('input/text', array(
-	'internalname' => 'publish_minute',
+	'name' => 'publish_minute',
 	'value' => date('i', $publish_date),
 	'class' => 'blog_publish_minute',
 ));
diff --git a/mod/blog/views/default/widgets/blog/edit.php b/mod/blog/views/default/widgets/blog/edit.php
index 4c3b1d4e2..30c3b2e73 100644
--- a/mod/blog/views/default/widgets/blog/edit.php
+++ b/mod/blog/views/default/widgets/blog/edit.php
@@ -9,7 +9,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
 );