瀏覽代碼

Merge pull request #5 from belomaxorka/fixed-deprecated

Fixed: Deprecated in html.php line 133
Sergei 2 年之前
父節點
當前提交
4b9eb57bf4
共有 3 個文件被更改,包括 52 次插入49 次删除
  1. 36 34
      system/acp/distributor.php
  2. 15 14
      system/distributor.php
  3. 1 1
      system/library/html.php

+ 36 - 34
system/acp/distributor.php

@@ -59,46 +59,48 @@
 	if(isset($html->arr['main']))
     {
 		$html->upd(
-			array(
-				'[cur]',
-				'[acp]',
-				'[home]',
-				'[js]',
-				'[css]',
-				'[img]'
-			),
-
-			array(
-				$cfg['currency'],
-				$cfg['http'].'acp/',
-				$cfg['http'],
-				$cfg['http'].'template/acp/js/',
-				$cfg['http'].'template/acp/css/',
-				$cfg['http'].'template/acp/images/'
-			),
-			'main'
+			'main',
+
+            array(
+                '[cur]',
+                '[acp]',
+                '[home]',
+                '[js]',
+                '[css]',
+                '[img]'
+            ),
+
+            array(
+                $cfg['currency'],
+                $cfg['http'].'acp/',
+                $cfg['http'],
+                $cfg['http'].'template/acp/js/',
+                $cfg['http'].'template/acp/css/',
+                $cfg['http'].'template/acp/images/'
+            ),
 		);
 	}
 
 	if(isset($html->arr['menu']))
     {
 		$html->upd(
-			array(
-				'[acp]',
-				'[home]',
-				'[js]',
-				'[css]',
-				'[img]'
-			),
-
-			array(
-				$cfg['http'].'acp/',
-				$cfg['http'],
-				$cfg['http'].'template/acp/js/',
-				$cfg['http'].'template/acp/css/',
-				$cfg['http'].'template/acp/images/'
-			),
-			'menu'
+			'menu',
+
+            array(
+                '[acp]',
+                '[home]',
+                '[js]',
+                '[css]',
+                '[img]'
+            ),
+
+            array(
+                $cfg['http'].'acp/',
+                $cfg['http'],
+                $cfg['http'].'template/acp/js/',
+                $cfg['http'].'template/acp/css/',
+                $cfg['http'].'template/acp/images/'
+            ),
 		);
 	}
 

+ 15 - 14
system/distributor.php

@@ -87,20 +87,21 @@
 	if(isset($html->arr['main']))
 	{
 		$html->upd(
-			array(
-				'[home]',
-				'[js]',
-				'[css]',
-				'[img]'
-			),
-
-			array(
-				$cfg['http'],
-				$cfg['http'].'template/js/',
-				$cfg['http'].'template/css/',
-				$cfg['http'].'template/images/'
-			),
-			'main'
+			'main',
+
+            array(
+                '[home]',
+                '[js]',
+                '[css]',
+                '[img]'
+            ),
+
+            array(
+                $cfg['http'],
+                $cfg['http'].'template/js/',
+                $cfg['http'].'template/css/',
+                $cfg['http'].'template/images/'
+            ),
 		);
 	}
 

+ 1 - 1
system/library/html.php

@@ -130,7 +130,7 @@
 			return NULL;
 		}
 
-		public function upd($old = array(), $new = array(), $name)
+		public function upd($name, $old = array(), $new = array())
 		{
 			$this->arr[$name] = str_replace($old, $new, $this->arr[$name]);