Stop using q as a page parameter

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index ddeb40192a1c72858d71ca4728ae5c25cc85aeb6..f6f23263e53bb8c76eea78e999a1d202aa3343c0 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -417,7 +417,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
                $_GET['callback']          = 'callback_name';
 
                $args = DI::args()->determine($_SERVER, $_GET);
@@ -445,7 +445,7 @@ class ApiTest extends FixtureTest
                ];
 
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -481,7 +481,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -521,7 +521,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.json';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.json';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -547,7 +547,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.xml';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.xml';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -573,7 +573,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.rss';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.rss';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -600,7 +600,7 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.atom';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.atom';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -622,7 +622,7 @@ class ApiTest extends FixtureTest
                global $API;
                $API['api_path'] = ['method' => 'method'];
 
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -647,7 +647,7 @@ class ApiTest extends FixtureTest
                ];
                $_SESSION['authenticated'] = false;
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index e8b4522eb0bac94da1af26bf3eb077a72f31d23f..49ca670599bc13adcc73254bd2185c046cb4e5db 100644 (file)
--- a/view/templates/install_checks.tpl
+++ b/view/templates/install_checks.tpl
@@ -1,7 +1,7 @@
 
 <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=install" method="post">
+<form  action="{{$baseurl}}/index.php?pagename=install" method="post">
 <table>
 {{foreach $checks as $check}}
        <tr><td>{{$check.title nofilter}} </td><td>