Civi::url() - Rename (p) to (t)

diff --git a/Civi.php b/Civi.php
index 70afbdd396f38e05dfee34a32e89aad30e02b5b6..1233dfbb5334d89852dc6fcec557c86a9758146c 100644 (file)
--- a/Civi.php
+++ b/Civi.php
@@ -265,7 +265,7 @@ class Civi {
    *   - 'a': absolute (aka `setPreferFormat('absolute')`)
    *   - 'r': relative (aka `setPreferFormat('relative')`)
    *   - 'h': html (aka `setHtmlEscape(TRUE)`)
-   *   - 'p': plain text (aka `setHtmlEscape(FALSE)`)
+   *   - 't': text (aka `setHtmlEscape(FALSE)`)
    *   - 's': ssl (aka `setSsl(TRUE)`)
    *   FIXME: Should we have a flag for appending 'resCacheCode'?
    * @return \Civi\Core\Url

diff --git a/Civi/Core/Url.php b/Civi/Core/Url.php
index b14ca4ab56e226204e9ce41e27497cc6fb61d3de..5a4a081c3d809e626718441bd5c5085e4db82e7c 100644 (file)
--- a/Civi/Core/Url.php
+++ b/Civi/Core/Url.php
@@ -330,8 +330,8 @@ final class Url {
           $this->htmlEscape = TRUE;
           break;
 
-        // (p)lain text encoding
-        case 'p':
+        // (t)ext encoding (canonical URL form)
+        case 't':
           $this->htmlEscape = FALSE;
           break;