Context Navigation

Changeset 20591

Timestamp:

10/03/08 12:53:28 (3 months ago)

Author:

riaf

Message:

trunk(for 1.6) 追従
コードの整理
ログイン周りの整理

Location:

events/phpframework

Files:

r15716	r20591
848	848	function loadFile() {$args = func_get_args();$this->load(call_user_func_array('file_get_contents', $args), true);}
849	849	}
850		?>
	850	?>==== ORIGINAL VERSION piece_framework/trunk/imports/pear/Rune/imports/simple_html_dom.php 122300536330523

r15755	r20591
16	16	RewriteRule ^public_timeline/?$ /self.php?view=public_timeline&%{QUERY_STRING} [L]
17	17	RewriteRule ^status/update/?$ /self.php [L]
	18	RewriteRule ^status/destroy/([0-9]+)/?$ /status/destroy.php?statusId=$1 [L]
18	19	RewriteRule ^status/destroy/([0-9]+)/?$ /status/destroy.php?statusId=$1 [L]
19	20

r15719	r20591
182	182
183	183	</body>
184		</html>
	184	</html>==== ORIGINAL VERSION piece_framework/trunk/web/frontend/webapp/templates/Globals/Layout.html 122300540333026
	185	<html>
	186	<head>
	187	</head>
	188	<body>
	189	<div content_for_layout="inner">
	190	</div>
	191	</body>
	192	<html>==== THEIR VERSION piece_framework/trunk/web/frontend/webapp/templates/Globals/Layout.html (/phwittr) 122300540333026

r15755	r20591
123	123	}
124	124	});
125		</script>
	125	</script>==== ORIGINAL VERSION piece_framework/trunk/web/frontend/webapp/templates/User/Archive.html 122300540292125

r15578	r20591
73	73	</div>
74	74	<!-- / #sub -->
75		</div>
	75	</div>==== ORIGINAL VERSION piece_framework/trunk/web/frontend/webapp/templates/User/Forbidden.html 122300536633092

r15583	r20591
71	71	jQuery('#follow-button{user.id}').show();
72	72	}
73		</script>
	73	</script>==== ORIGINAL VERSION piece_framework/trunk/web/frontend/webapp/templates/User/UserList.html 122300540276932

r20590	r20591
171	171	$user = $this->loginRequired();
172	172	$this->setSession('notice', 'Hi! ' . $user->name);
	173	$user = RequestLogin::getLoginSession();
	174	$this->setSession('notice', 'Hi! ' . $user->name);
173	175	Header::redirect(Rhaco::url('home'));
174	176	}