← All changes | includes/query.php +66 -34 2.1 → 2.9 View file →

		@@ -4,10 +4,11 @@
4	4
5	5	function bogo_parse_query( $query ) {
6	6	$qv = &$query->query_vars;
7	7
8		- if ( ! empty( $qv['bogo_suppress_locale_query'] ) )
	8	+ if ( ! empty( $qv['bogo_suppress_locale_query'] ) ) {
9	9	return;
	10	+ }
10	11
11	12	if ( isset( $qv['post_type'] ) && 'any' != $qv['post_type'] ) {
12	13	$localizable = array_filter( (array) $qv['post_type'], 'bogo_is_localizable_post_type' );
13	14
		@@ -21,15 +22,17 @@
21	22
22	23	if ( is_admin() ) {
23	24	$locale = $lang;
24	25	} else {
25		- if ( $lang )
	26	+ if ( $lang ) {
26	27	$locale = bogo_get_closest_locale( $lang );
27		- else
	28	+ } else {
28	29	$locale = get_locale();
	30	+ }
29	31
30		- if ( empty( $locale ) )
	32	+ if ( empty( $locale ) ) {
31	33	$locale = bogo_get_default_locale();
	34	+ }
32	35	}
33	36
34	37	if ( empty( $locale ) || ! bogo_is_available_locale( $locale ) ) {
35	38	$qv['bogo_suppress_locale_query'] = true;
		@@ -37,10 +40,11 @@
37	40	}
38	41
39	42	$qv['lang'] = $locale;
40	43
41		- if ( is_admin() )
	44	+ if ( is_admin() ) {
42	45	return;
	46	+ }
43	47
44	48	if ( $query->is_home && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) ) {
45	49	$query_keys = array_keys( wp_parse_args( $query->query ) );
46	50	$query_keys = array_diff( $query_keys,
		@@ -61,14 +65,15 @@
61	65
62	66	if ( '' != $qv['pagename'] ) {
63	67	$query->queried_object = bogo_get_page_by_path( $qv['pagename'], $locale );
64	68
65		- if ( ! empty( $query->queried_object ) )
	69	+ if ( ! empty( $query->queried_object ) ) {
66	70	$query->queried_object_id = (int) $query->queried_object->ID;
67		- else
	71	+ } else {
68	72	unset( $query->queried_object );
	73	+ }
69	74
70		- if ( 'page' == get_option( 'show_on_front' )
	75	+ if ( 'page' == get_option( 'show_on_front' )
71	76	&& isset( $query->queried_object_id )
72	77	&& $query->queried_object_id == get_option( 'page_for_posts' ) ) {
73	78	$query->is_page = false;
74	79	$query->is_home = true;
		@@ -74,8 +79,22 @@
74	79	$query->is_home = true;
75	80	$query->is_posts_page = true;
76	81	}
77	82	}
	83	+
	84	+ if ( isset( $qv['post_type'] )
	85	+ && 'any' != $qv['post_type']
	86	+ && ! is_array( $qv['post_type'] )
	87	+ && '' != $qv['name'] ) {
	88	+ $query->queried_object = bogo_get_page_by_path(
	89	+ $qv['name'], $locale, $qv['post_type'] );
	90	+
	91	+ if ( ! empty( $query->queried_object ) ) {
	92	+ $query->queried_object_id = (int) $query->queried_object->ID;
	93	+ } else {
	94	+ unset( $query->queried_object );
	95	+ }
	96	+ }
78	97	}
79	98
80	99	add_filter( 'posts_join', 'bogo_posts_join', 10, 2 );
81	100
		@@ -83,18 +102,21 @@
83	102	global $wpdb;
84	103
85	104	$qv = &$query->query_vars;
86	105
87		- if ( ! empty( $qv['bogo_suppress_locale_query'] ) )
	106	+ if ( ! empty( $qv['bogo_suppress_locale_query'] ) ) {
88	107	return $join;
	108	+ }
89	109
90	110	$locale = empty( $qv['lang'] ) ? '' : $qv['lang'];
91	111
92		- if ( ! bogo_is_available_locale( $locale ) )
	112	+ if ( ! bogo_is_available_locale( $locale ) ) {
93	113	return $join;
	114	+ }
94	115
95		- if ( ! $meta_table = _get_meta_table( 'post' ) )
	116	+ if ( ! $meta_table = _get_meta_table( 'post' ) ) {
96	117	return $join;
	118	+ }
97	119
98	120	$join .= " LEFT JOIN $meta_table AS postmeta_bogo ON ($wpdb->posts.ID = postmeta_bogo.post_id AND postmeta_bogo.meta_key = '_locale')";
99	121
100	122	return $join;
		@@ -106,25 +128,29 @@
106	128	global $wpdb;
107	129
108	130	$qv = &$query->query_vars;
109	131
110		- if ( ! empty( $qv['bogo_suppress_locale_query'] ) )
	132	+ if ( ! empty( $qv['bogo_suppress_locale_query'] ) ) {
111	133	return $where;
	134	+ }
112	135
113	136	$locale = empty( $qv['lang'] ) ? '' : $qv['lang'];
114	137
115		- if ( ! bogo_is_available_locale( $locale ) )
	138	+ if ( ! bogo_is_available_locale( $locale ) ) {
116	139	return $where;
	140	+ }
117	141
118		- if ( ! $meta_table = _get_meta_table( 'post' ) )
	142	+ if ( ! $meta_table = _get_meta_table( 'post' ) ) {
119	143	return $where;
	144	+ }
120	145
121	146	$where .= " AND (1=0";
122	147
123	148	$where .= $wpdb->prepare( " OR postmeta_bogo.meta_value LIKE %s", $locale );
124	149
125		- if ( bogo_is_default_locale( $locale ) )
	150	+ if ( bogo_is_default_locale( $locale ) ) {
126	151	$where .= " OR postmeta_bogo.meta_id IS NULL";
	152	+ }
127	153
128	154	$where .= ")";
129	155
130	156	return $where;
		@@ -132,10 +158,11 @@
132	158
133	159	add_filter( 'option_sticky_posts', 'bogo_option_sticky_posts' );
134	160
135	161	function bogo_option_sticky_posts( $posts ) {
136		- if ( is_admin() )
	162	+ if ( is_admin() ) {
137	163	return $posts;
	164	+ }
138	165
139	166	$locale = get_locale();
140	167
141	168	foreach ( $posts as $key => $post_id ) {
		@@ -145,31 +172,36 @@
145	172
146	173	return $posts;
147	174	}
148	175
149		-add_filter( 'option_page_on_front', 'bogo_option_page_on_front' );
	176	+add_filter( 'option_page_on_front', 'bogo_get_local_post' );
	177	+add_filter( 'option_page_for_posts', 'bogo_get_local_post' );
150	178
151		-function bogo_option_page_on_front( $page_id ) {
	179	+function bogo_get_local_post( $post_id ) {
152	180	global $wpdb;
153	181
154		- if ( ! bogo_is_localizable_post_type( 'page' ) )
155		- return $page_id;
	182	+ if ( is_admin() || empty( $post_id ) ) {
	183	+ return $post_id;
	184	+ }
156	185
157		- if ( empty( $page_id ) )
158		- return $page_id;
	186	+ $post_type = get_post_type( $post_id );
159	187
160		- if ( is_admin() )
161		- return $page_id;
	188	+ if ( ! post_type_exists( $post_type )
	189	+ || ! bogo_is_localizable_post_type( $post_type ) ) {
	190	+ return $post_id;
	191	+ }
162	192
163	193	$locale = get_locale();
164	194
165		- if ( bogo_get_post_locale( $page_id ) == $locale )
166		- return $page_id;
	195	+ if ( bogo_get_post_locale( $post_id ) == $locale ) {
	196	+ return $post_id;
	197	+ }
167	198
168		- $original = get_post_meta( $page_id, '_original_post', true );
	199	+ $original = get_post_meta( $post_id, '_original_post', true );
169	200
170		- if ( empty( $original ) )
171		- $original = $page_id;
	201	+ if ( empty( $original ) ) {
	202	+ $original = $post_id;
	203	+ }
172	204
173	205	$q = "SELECT ID FROM $wpdb->posts AS posts";
174	206	$q .= " LEFT JOIN $wpdb->postmeta AS pm1";
175	207	$q .= " ON posts.ID = pm1.post_id AND pm1.meta_key = '_original_post'";
		@@ -175,9 +207,10 @@
175	207	$q .= " ON posts.ID = pm1.post_id AND pm1.meta_key = '_original_post'";
176	208	$q .= " LEFT JOIN $wpdb->postmeta AS pm2";
177	209	$q .= " ON posts.ID = pm2.post_id AND pm2.meta_key = '_locale'";
178	210	$q .= " WHERE 1=1";
179		- $q .= " AND post_type = 'page'";
	211	+ $q .= " AND post_status = 'publish'";
	212	+ $q .= $wpdb->prepare( " AND post_type = %s", $post_type );
180	213	$q .= $wpdb->prepare( " AND (ID = %d OR pm1.meta_value = %d)",
181	214	$original, $original );
182	215	$q .= " AND (1=0";
183	216	$q .= $wpdb->prepare( " OR pm2.meta_value LIKE %s", $locale );
		@@ -185,11 +218,10 @@
185	218	$q .= ")";
186	219
187	220	$translation = absint( $wpdb->get_var( $q ) );
188	221
189		- if ( $translation )
	222	+ if ( $translation ) {
190	223	return $translation;
	224	+ }
191	225
192		- return $page_id;
	226	+ return $post_id;
193	227	}
194		-
195		-?>