aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-03-25 12:59:50 -0700
committerfriendica <info@friendica.com>2013-03-25 12:59:50 -0700
commitfecc7bfad4582c5f13fe8471d4b1ce9ae98e0ab8 (patch)
tree0f0b3004535c944099e7710d5731cbc46a3c8af1
parent23cd14329dcdc5b732a64bd7ba21123f24dd5cfd (diff)
parentfb8a0e06c48f974d7e6ef864992d7453b91cd640 (diff)
downloadvolse-hubzilla-fecc7bfad4582c5f13fe8471d4b1ce9ae98e0ab8.tar.gz
volse-hubzilla-fecc7bfad4582c5f13fe8471d4b1ce9ae98e0ab8.tar.bz2
volse-hubzilla-fecc7bfad4582c5f13fe8471d4b1ce9ae98e0ab8.zip
Merge pull request #43 from beardy-unixer/master
Update build_query for mid
-rw-r--r--mod/channel.php2
-rw-r--r--mod/display.php8
-rw-r--r--mod/search.php2
-rw-r--r--view/tpl/build_query.tpl4
-rw-r--r--view/tpl/smarty3/build_query.tpl4
5 files changed, 9 insertions, 11 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 10bd0417f..ff6f1f309 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -248,7 +248,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'$order' => '',
'$file' => '',
'$cats' => (($category) ? $category : ''),
- '$uri' => '',
+ '$mid' => '',
'$dend' => $datequery,
'$dbegin' => $datequery2
));
diff --git a/mod/display.php b/mod/display.php
index d5feb1f54..170f800ac 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -23,11 +23,9 @@ function display_content(&$a, $update = 0, $load = false) {
if(argc() > 1 && argv(1) !== 'load')
$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'])
- $item_hash = $_REQUEST['uri'];
+ if($_REQUEST['mid'])
+ $item_hash = $_REQUEST['mid'];
if(! $item_hash) {
@@ -85,7 +83,7 @@ function display_content(&$a, $update = 0, $load = false) {
'$cats' => '',
'$dend' => '',
'$dbegin' => '',
- '$uri' => $item_hash
+ '$mid' => $item_hash
));
diff --git a/mod/search.php b/mod/search.php
index 9ae9414d2..fdd79f0a1 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -175,7 +175,7 @@ function search_content(&$a) {
'$order' => '',
'$file' => '',
'$cats' => '',
- '$uri' => '',
+ '$mid' => '',
'$dend' => '',
'$dbegin' => ''
));
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index f4795acb2..0f4905638 100644
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -22,7 +22,7 @@
var bParam_cats = "$cats";
var bParam_dend = "$dend";
var bParam_dbegin = "$dbegin";
- var bParam_uri = "$uri";
+ var bParam_mid = "$mid";
function buildCmd() {
var udargs = ((page_load) ? "/load" : "");
@@ -43,7 +43,7 @@
if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
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;
return(bCmd);
}
diff --git a/view/tpl/smarty3/build_query.tpl b/view/tpl/smarty3/build_query.tpl
index 6df7f6589..a84f09031 100644
--- a/view/tpl/smarty3/build_query.tpl
+++ b/view/tpl/smarty3/build_query.tpl
@@ -27,7 +27,7 @@
var bParam_cats = "{{$cats}}";
var bParam_dend = "{{$dend}}";
var bParam_dbegin = "{{$dbegin}}";
- var bParam_uri = "{{$uri}}";
+ var bParam_mid = "{{$mid}}";
function buildCmd() {
var udargs = ((page_load) ? "/load" : "");
@@ -48,7 +48,7 @@
if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
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;
return(bCmd);
}