Merge remote branch 'upstream/develop' into develop-next

Conflicts:
	js/osticket.js

include/class.faq.php

@@ -184,9 +184,7 @@ class FAQ {
 
         // Inline images (attached to the draft)
         $this->attachments->deleteInlines();
-        if (isset($vars['draft_id']) && $vars['draft_id'])
-            if ($draft = Draft::lookup($vars['draft_id']))
-                $this->attachments->upload($draft->getAttachmentIds(), true);
+        $this->attachments->upload(Draft::getAttachmentIds($vars['answer']));
 
         $this->reload();
 

include/class.user.php

@@ -714,6 +714,13 @@ class PersonsName {
 
         $r = explode(' ', $name);
         $size = count($r);
+        
+        //check if name is bad format (ex: J.Everybody), and fix them
+        if($size==1 && mb_strpos($r[0], '.') !== false) 
+        {
+            $r = explode('.', $name);
+            $size = count($r);
+        }
 
         //check first for period, assume salutation if so
         if (mb_strpos($r[0], '.') === false)

js/osticket.js

@@ -220,3 +220,16 @@ function __(s) {
 }
 
 $.clientPortal = true;
+
+$(document).on('submit', 'form', function() {
+    // Reformat dates
+    $('.dp', $(this)).each(function(i, e) {
+        var $e = $(e),
+            d = $e.datepicker('getDate');
+        if (!d) return;
+        var day = ('0'+d.getDate()).substr(-2),
+            month = ('0'+(d.getMonth()+1)).substr(-2),
+            year = d.getFullYear();
+        $e.val(year+'-'+month+'-'+day);
+    });
+});

scp/pages.php

@@ -27,11 +27,9 @@ if($_POST) {
                 $_REQUEST['a'] = null;
                 $msg=sprintf(__('Successfully added %s'), Format::htmlchars($_POST['name']));
                 // Attach inline attachments from the editor
-                if (isset($_POST['draft_id'])
-                        && ($draft = Draft::lookup($_POST['draft_id']))
-                        && ($page = Page::lookup($pageId)))
+                if ($page = Page::lookup($pageId))
                     $page->attachments->upload(
-                        $draft->getAttachmentIds($_POST['response']), true);
+                        Draft::getAttachmentIds($_POST['body']), true);
                 Draft::deleteForNamespace('page');
             } elseif(!$errors['err'])
                 $errors['err'] = sprintf(__('Unable to add %s. Correct error(s) below and try again.'),
@@ -46,12 +44,10 @@ if($_POST) {
                     __('this site page'));
                 $_REQUEST['a']=null; //Go back to view
                 // Attach inline attachments from the editor
-                if (isset($_POST['draft_id'])
-                        && ($draft = Draft::lookup($_POST['draft_id']))) {
-                    $page->attachments->deleteInlines();
-                    $page->attachments->upload(
-                        $draft->getAttachmentIds($_POST['response']),
-                        true);
+                $page->attachments->deleteInlines();
+                $page->attachments->upload(
+                    Draft::getAttachmentIds($_POST['body']),
+                    true);
                 }
                 Draft::deleteForNamespace('page.'.$page->getId());
             } elseif(!$errors['err'])