X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=CRM%2FCore%2FPage%2FBasic.php;h=d0632397c490d9bd69fc6d93c9924c3ce2328c4a;hb=fd31fa4c65b766d62df21f578772960955322576;hp=c15145f3afbb0e75ac5ad80863f77d0628ce4464;hpb=6628866da4eb17b8ff190928d8afdbee11526ae6;p=civicrm-core.git

diff --git a/CRM/Core/Page/Basic.php b/CRM/Core/Page/Basic.php
index c15145f3af..d0632397c4 100644
--- a/CRM/Core/Page/Basic.php
+++ b/CRM/Core/Page/Basic.php
@@ -127,9 +127,9 @@ abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
    * class constructor
    *
    * @param string $title title of the page
-   * @param int    $mode  mode of the page
+   * @param int $mode mode of the page
    *
-   * @return CRM_Core_Page
+   * @return \CRM_Core_Page_Basic
    */
   function __construct($title = NULL, $mode = NULL) {
     parent::__construct($title, $mode);
@@ -241,8 +241,10 @@ abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
       $object->orderBy($key . ' asc');
     }
 
-
-    $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements();
+    //@todo FIXME - using the CRM_Core_DAO::VALUE_SEPARATOR creates invalid html - if you can find the form
+    // this is loaded onto then replace with something like '__' & test
+    $separator = CRM_Core_DAO::VALUE_SEPARATOR;
+    $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements(FALSE, TRUE, $separator);
     // find all objects
     $object->find();
     while ($object->fetch()) {
@@ -361,6 +363,9 @@ abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
    * @param int $mode - what mode for the form ?
    * @param int $id - id of the entity (for update, view operations)
    *
+   * @param bool $imageUpload
+   * @param bool $pushUserContext
+   *
    * @return void
    */
   function edit($mode, $id = NULL, $imageUpload = FALSE, $pushUserContext = TRUE) {