diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index 9e9d8e4b48f..293ddf682d1 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -30,13 +30,15 @@ class tinymce_texteditor extends texteditor {
             return true;
         } else if (check_browser_version('Gecko', 20030516)) {
             return true;
+        } else if (check_browser_version('Safari iOS')) {
+            return false;
         } else if (check_browser_version('Safari', 3)) {
             return true;
         } else if (check_browser_version('Opera', 9)) {
             return true;
         }
 
-        return true;
+        return false;
     }
 
     public function get_supported_formats() {
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 8c796fd379a..57a297e53ff 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7264,12 +7264,12 @@ function check_php_version($version='5.2.4') {
 
       case 'Camino':   /// Mozilla Firefox browsers
 
-              if (preg_match("/Camino\/([0-9\.]+)/i", $agent, $match)) {
-                  if (version_compare($match[1], $version) >= 0) {
-                      return true;
-                  }
+          if (preg_match("/Camino\/([0-9\.]+)/i", $agent, $match)) {
+              if (version_compare($match[1], $version) >= 0) {
+                  return true;
               }
-              break;
+          }
+          break;
 
 
       case 'Firefox':   /// Mozilla Firefox browsers
@@ -7344,6 +7344,15 @@ function check_php_version($version='5.2.4') {
 
           break;
 
+      case 'Safari iOS':  /// Safari on iPhone and iPad
+          if (strpos($agent, 'iPhone')) {
+              return true;
+          }
+          if (strpos($agent, 'iPad')) {
+              return true;
+          }
+          break;
+
     }
 
     return false;