harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated build_query for mid

Browse Source
This commit is contained in:
Thomas Willingham 2013-03-25 19:20:12 +00:00
parent 23cd14329d
commit fb8a0e06c4
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/channel.php
View File

@ -248,7 +248,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'$order' => '', '$order' => '',
'$file' => '', '$file' => '',
'$cats' => (($category) ? $category : ''), '$cats' => (($category) ? $category : ''),
'$uri' => '', '$mid' => '',
'$dend' => $datequery, '$dend' => $datequery,
'$dbegin' => $datequery2 '$dbegin' => $datequery2
)); ));

8
mod/display.php
View File

@ -23,11 +23,9 @@ function display_content(&$a, $update = 0, $load = false) {
if(argc() > 1 && argv(1) !== 'load') if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1); $item_hash = argv(1);
// This should actually be mid, but it needs to be changed in build_query.tpl and in all the
// pages which call it
if($_REQUEST['uri']) if($_REQUEST['mid'])
$item_hash = $_REQUEST['uri']; $item_hash = $_REQUEST['mid'];
if(! $item_hash) { if(! $item_hash) {
@ -85,7 +83,7 @@ function display_content(&$a, $update = 0, $load = false) {
'$cats' => '', '$cats' => '',
'$dend' => '', '$dend' => '',
'$dbegin' => '', '$dbegin' => '',
'$uri' => $item_hash '$mid' => $item_hash
)); ));

2
mod/search.php
View File

@ -175,7 +175,7 @@ function search_content(&$a) {
'$order' => '', '$order' => '',
'$file' => '', '$file' => '',
'$cats' => '', '$cats' => '',
'$uri' => '', '$mid' => '',
'$dend' => '', '$dend' => '',
'$dbegin' => '' '$dbegin' => ''
)); ));

4
view/tpl/build_query.tpl
View File

@ -22,7 +22,7 @@
var bParam_cats = "$cats"; var bParam_cats = "$cats";
var bParam_dend = "$dend"; var bParam_dend = "$dend";
var bParam_dbegin = "$dbegin"; var bParam_dbegin = "$dbegin";
var bParam_uri = "$uri"; var bParam_mid = "$mid";
function buildCmd() { function buildCmd() {
var udargs = ((page_load) ? "/load" : ""); var udargs = ((page_load) ? "/load" : "");
@ -43,7 +43,7 @@
if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
if(bParam_uri != "") bCmd = bCmd + "&uri=" + bParam_uri; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
return(bCmd); return(bCmd);
} }

4
view/tpl/smarty3/build_query.tpl
View File

@ -27,7 +27,7 @@
var bParam_cats = "{{$cats}}"; var bParam_cats = "{{$cats}}";
var bParam_dend = "{{$dend}}"; var bParam_dend = "{{$dend}}";
var bParam_dbegin = "{{$dbegin}}"; var bParam_dbegin = "{{$dbegin}}";
var bParam_uri = "{{$uri}}"; var bParam_mid = "{{$mid}}";
function buildCmd() { function buildCmd() {
var udargs = ((page_load) ? "/load" : ""); var udargs = ((page_load) ? "/load" : "");
@ -48,7 +48,7 @@
if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
if(bParam_uri != "") bCmd = bCmd + "&uri=" + bParam_uri; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
return(bCmd); return(bCmd);
} }