projects / efiction3-v4 / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
undefined key fix
undefined key fix

file:a/admin/blocks.php -> file:b/admin/blocks.php 
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -65,9 +65,13 @@
 // In case the skin has already overridden the block settings or we've just changed the settings.
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+
+	if($block['block_variables']) {
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
-	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
 }
 	unset($content);
file:a/blocks/categories/admin.php -> file:b/blocks/categories/admin.php 
--- a/blocks/categories/admin.php
+++ b/blocks/categories/admin.php
@@ -31,7 +31,10 @@
 $content = "";
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'categories'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/countdown/admin.php -> file:b/blocks/countdown/admin.php 
--- a/blocks/countdown/admin.php
+++ b/blocks/countdown/admin.php
@@ -4,7 +4,10 @@
 global $language, $numupdated;
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'countdown'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/featured/admin.php -> file:b/blocks/featured/admin.php 
--- a/blocks/featured/admin.php
+++ b/blocks/featured/admin.php
@@ -2,7 +2,10 @@
 if(!defined("_CHARSET")) exit( );
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'featured'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/info/admin.php -> file:b/blocks/info/admin.php 
--- a/blocks/info/admin.php
+++ b/blocks/info/admin.php
@@ -4,7 +4,10 @@
 global $language;
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'info'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/login/admin.php -> file:b/blocks/login/admin.php 
--- a/blocks/login/admin.php
+++ b/blocks/login/admin.php
@@ -2,7 +2,10 @@
 if(!defined("_CHARSET")) exit( );
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'login'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/menu/admin.php -> file:b/blocks/menu/admin.php 
--- a/blocks/menu/admin.php
+++ b/blocks/menu/admin.php
@@ -7,7 +7,10 @@
 
 		$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = '$admin'");
 		while($block = dbassoc($blockquery)) {
-			$blocks[$block['block_name']] = unserialize($block['block_variables']);
+			if ($block['block_variables'])
+			{
+				$blocks[$block['block_name']] = unserialize($block['block_variables']);
+			}
 			$blocks[$block['block_name']]['title'] = $block['block_title'];
 			$blocks[$block['block_name']]['file'] = $block['block_file'];
 			$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/news/admin.php -> file:b/blocks/news/admin.php 
--- a/blocks/news/admin.php
+++ b/blocks/news/admin.php
@@ -2,7 +2,10 @@
 if(!defined("_CHARSET")) exit( );
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'news'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/poll/admin.php -> file:b/blocks/poll/admin.php 
--- a/blocks/poll/admin.php
+++ b/blocks/poll/admin.php
@@ -4,7 +4,10 @@
 global $language, $tinyMCE, $allowed_tags;
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'poll'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/random/admin.php -> file:b/blocks/random/admin.php 
--- a/blocks/random/admin.php
+++ b/blocks/random/admin.php
@@ -4,7 +4,10 @@
 global $language;
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'random'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
file:a/blocks/recent/admin.php -> file:b/blocks/recent/admin.php 
--- a/blocks/recent/admin.php
+++ b/blocks/recent/admin.php
@@ -4,7 +4,10 @@
 global $language, $numupdated;
 $blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'recent'");
 while($block = dbassoc($blockquery)) {
-	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
 	$blocks[$block['block_name']]['title'] = $block['block_title'];
 	 $blocks[$block['block_name']]['file'] = $block['block_file'];
 	$blocks[$block['block_name']]['status'] = $block['block_status'];
Hard 'fork' of https://github.com/e107-eFiction/efiction_noconflict , mainly to preserve commits for reference only.
GitPHP by Chris Han