diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php
index be9a45d3..bf680a1b 100644
--- a/engine/classes/Engine.class.php
+++ b/engine/classes/Engine.class.php
@@ -947,7 +947,9 @@ class Engine extends Object {
if($aInfo[Engine::CI_INHERIT]){
$sInheritClass = $aInfo[Engine::CI_INHERIT];
$sParentClass = Engine::getInstance()->Plugin_GetParentInherit($sInheritClass);
- class_alias($sParentClass,$sClassName);
+ if(!class_alias($sParentClass,$sClassName)){
+ dump("(autoload $sParentClass) Can not load CLASS-file");
+ }
}elseif($aInfo[Engine::CI_CLASSPATH]){
require_once $aInfo[Engine::CI_CLASSPATH];
}elseif(!class_exists($sClassName)){
diff --git a/engine/include/function.php b/engine/include/function.php
index 52945ecc..97814bc8 100644
--- a/engine/include/function.php
+++ b/engine/include/function.php
@@ -128,19 +128,16 @@ function func_generator($iLength=10) {
/**
* htmlspecialchars умеющая обрабатывать массивы
*
- * @param unknown_type $data
+ * @param mixed $data
+ * @param int %walkIndex - represents the key/index of the array being recursively htmlspecialchars'ed
+ * @return void
*/
-function func_htmlspecialchars(&$data) {
- if (is_array($data)) {
- foreach ($data as $sKey => $value) {
- if (is_array($value)) {
- func_htmlspecialchars($data[$sKey]);
- } else {
- $data[$sKey]=htmlspecialchars($value);
- }
- }
- } else {
- $data=htmlspecialchars($data);
+function func_htmlspecialchars(&$data, $walkIndex = null)
+{
+ if(is_string($data)){
+ $data = htmlspecialchars($data);
+ }elseif(is_array($data)){
+ array_walk($data, __FUNCTION__);
}
}
@@ -402,7 +399,11 @@ if (!function_exists('array_intersect_key')) {
if (!function_exists('class_alias')) {
function class_alias($original, $alias) {
+ if(!class_exists($original)){
+ return false;
+ }
eval('abstract class ' . $alias . ' extends ' . $original . ' {}');
+ return true;
}
}
diff --git a/engine/lib/external/jquery/markitup/skins/simple/style.css b/engine/lib/external/jquery/markitup/skins/simple/style.css
index f2641c91..d1fa3f49 100644
--- a/engine/lib/external/jquery/markitup/skins/simple/style.css
+++ b/engine/lib/external/jquery/markitup/skins/simple/style.css
@@ -42,7 +42,12 @@
border-left: 1px solid #c0cad5;
border-right: 1px solid #c0cad5;
}
-.markItUpHeader ul { overflow: visible; zoom: 1; }
+.markItUpHeader ul {
+ overflow: visible;
+ zoom: 1;
+ display: inline-block;
+ *display: inline; /* ie <= 7 */
+}
.markItUpHeader ul li { list-style: none; float: left; position: relative; margin-right: 6px; }
.markItUpHeader ul li: hover > ul{ display: block; }
.markItUpHeader ul .markItUpDropMenu {
diff --git a/engine/lib/internal/template/js/main.js b/engine/lib/internal/template/js/main.js
index d65eb333..b35253f7 100644
--- a/engine/lib/internal/template/js/main.js
+++ b/engine/lib/internal/template/js/main.js
@@ -1,5 +1,11 @@
Function.prototype.bind = function(context) {
var fn = this;
+ if(jQuery.type(fn) != 'function'){
+ throw new TypeError('Function.prototype.bind: call on non-function');
+ };
+ if(jQuery.type(context) == 'null'){
+ throw new TypeError('Function.prototype.bind: cant be bound to null');
+ };
return function() {
return fn.apply(context, arguments);
};
@@ -8,7 +14,7 @@ String.prototype.tr = function(a,p) {
var k;
var p = typeof(p)=='string' ? p : '';
var s = this;
- $.each(a,function(k){
+ jQuery.each(a,function(k){
var tk = p?p.split('/'):[];
tk[tk.length] = k;
var tp = tk.join('/');
@@ -25,8 +31,8 @@ String.prototype.tr = function(a,p) {
var ls = ls || {};
/**
-* Управление всплывающими сообщениями
-*/
+ * Управление всплывающими сообщениями
+ */
ls.msg = (function ($) {
/**
* Опции
@@ -425,7 +431,7 @@ ls = (function ($) {
* Лог сообщений
*/
this.log = function() {
- if (window.console && window.console.log) {
+ if (!$.browser.msie && window.console && window.console.log) {
Function.prototype.bind.call(console.log, console).apply(console, arguments);
} else {
//alert(msg);
diff --git a/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl b/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
index 89afba36..7cdd0081 100644
--- a/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
+++ b/plugins/page/templates/skin/developer-jquery/actions/ActionPage/add.tpl
@@ -7,67 +7,69 @@
{literal}
{/literal}
-
+
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
{/if}
-
-
+
+
\ No newline at end of file
diff --git a/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl b/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
index 89afba36..7cdd0081 100644
--- a/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
+++ b/plugins/page/templates/skin/new-jquery/actions/ActionPage/add.tpl
@@ -7,67 +7,69 @@
{literal}
{/literal}
-
+
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
{/if}
-
-
+
+
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
index 70d524cb..70682d83 100644
--- a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
@@ -6,35 +6,37 @@
@@ -44,7 +46,7 @@ tinyMCE.init({
@@ -68,38 +70,38 @@ tinyMCE.init({
{else}
{$aLang.topic_photoset_edit}
{/if}
-
-
-
-
-
-
-
-
{hook run='add_topic_photoset_begin'}